[FFmpeg-cvslog] avformat/utils: Do not ignore failure in extract_extradata_init()

Michael Niedermayer git at videolan.org
Sun Oct 7 04:07:50 EEST 2018


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep 27 00:00:24 2018 +0200| [beb3aea48e5f8a3d57f244fb8998ddf04928ee81] | committer: Michael Niedermayer

avformat/utils: Do not ignore failure in extract_extradata_init()

We check for the documented explanation of the "Ignore code" in extract_extradata_check() already

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/utils.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index c973a7e0c5..7e5783c14c 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3489,13 +3489,9 @@ static int extract_extradata_init(AVStream *st)
 
     i->extract_extradata.bsf->time_base_in = st->time_base;
 
-    /* if init fails here, we assume extracting extradata is just not
-     * supported for this codec, so we return success */
     ret = av_bsf_init(i->extract_extradata.bsf);
-    if (ret < 0) {
-        av_bsf_free(&i->extract_extradata.bsf);
-        ret = 0;
-    }
+    if (ret < 0)
+        goto fail;
 
 finish:
     i->extract_extradata.inited = 1;



More information about the ffmpeg-cvslog mailing list