[FFmpeg-cvslog] avfilter: fix regression since addition of extended_data to audio

Michael Niedermayer git at videolan.org
Sat May 12 23:55:34 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 12 23:46:43 2012 +0200| [ad6f006081c04532335324a5a72d61f36ec386d7] | committer: Michael Niedermayer

avfilter: fix regression since addition of extended_data to audio

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/avfilter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 073b259..4354f8c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -78,7 +78,7 @@ AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)
         }
         *ret->audio = *ref->audio;
 
-        if (ref->extended_data != ref->data) {
+        if (ref->extended_data && ref->extended_data != ref->data) {
             int nb_channels = av_get_channel_layout_nb_channels(ref->audio->channel_layout);
             if (!(ret->extended_data = av_malloc(sizeof(*ret->extended_data) *
                                                  nb_channels))) {



More information about the ffmpeg-cvslog mailing list