[vlc-commits] aout: dead code

Rémi Denis-Courmont git at videolan.org
Thu Apr 25 17:41:32 CEST 2013


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Apr 25 18:29:52 2013 +0300| [70ff276382790d497cdfe76c38676537dc4e49ec] | committer: Rémi Denis-Courmont

aout: dead code

(request_vout is always non-NULL)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70ff276382790d497cdfe76c38676537dc4e49ec
---

 src/audio_output/filters.c |   25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index b29833b..dd37c65 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -313,22 +313,6 @@ static int EqualizerCallback (vlc_object_t *obj, const char *var,
     return VLC_SUCCESS;
 }
 
-static vout_thread_t *RequestVout (void *data, vout_thread_t *vout,
-                                   video_format_t *fmt, bool recycle)
-{
-    audio_output_t *aout = data;
-    vout_configuration_t cfg = {
-        .vout       = vout,
-        .input      = NULL,
-        .change_fmt = true,
-        .fmt        = fmt,
-        .dpb_size   = 1,
-    };
-
-    (void) recycle;
-    return vout_Request (aout, &cfg);
-}
-
 vout_thread_t *aout_filter_RequestVout (filter_t *filter, vout_thread_t *vout,
                                         video_format_t *fmt)
 {
@@ -426,14 +410,7 @@ int aout_FiltersNew (audio_output_t *aout,
         free (visual);
         visual = NULL;
     }
-
-    if (request_vout != NULL)
-        owner->request_vout = *request_vout;
-    else
-    {
-        owner->request_vout.pf_request_vout = RequestVout;
-        owner->request_vout.p_private = aout;
-    }
+    owner->request_vout = *p_request_vout;
     owner->recycle_vout = visual != NULL;
 
     /* parse user filter lists */



More information about the vlc-commits mailing list