[FFmpeg-cvslog] lavfi/ebur128: fix format negociation for output.

Clément Bœsch git at videolan.org
Thu Mar 14 01:25:03 CET 2013


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Mar 14 00:56:20 2013 +0100| [9efcfbed9dd64679145f5f39d9a812dfeea97172] | committer: Clément Bœsch

lavfi/ebur128: fix format negociation for output.

Before this change, the audio input and output formats are set
independently, so the lavfi negociation could pick different settings
for the input and output. This is particularly true for the channel
layout settings, where multiple choices were available.

Fixes Ticket2342.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9efcfbed9dd64679145f5f39d9a812dfeea97172
---

 libavfilter/f_ebur128.c |   16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c
index 05ea630..acf29d5 100644
--- a/libavfilter/f_ebur128.c
+++ b/libavfilter/f_ebur128.c
@@ -690,22 +690,6 @@ static int query_formats(AVFilterContext *ctx)
         outlink = ctx->outputs[1];
     }
 
-    /* set audio output formats (same as input since it's just a passthrough) */
-    formats = ff_make_format_list(sample_fmts);
-    if (!formats)
-        return AVERROR(ENOMEM);
-    ff_formats_ref(formats, &outlink->in_formats);
-
-    layouts = ff_all_channel_layouts();
-    if (!layouts)
-        return AVERROR(ENOMEM);
-    ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
-
-    formats = ff_make_format_list(input_srate);
-    if (!formats)
-        return AVERROR(ENOMEM);
-    ff_formats_ref(formats, &outlink->in_samplerates);
-
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list