[FFmpeg-cvslog] avformat/mux: Check return code of av_packet_split_side_data()

Michael Niedermayer git at videolan.org
Thu Mar 30 17:40:13 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Mar 30 15:58:32 2017 +0200| [8779ec91b22338ac916c48f5e6255570c44443b0] | committer: Michael Niedermayer

avformat/mux: Check return code of av_packet_split_side_data()

Fixes CID1403225

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

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

 libavformat/mux.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index e684385..3a5e876 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -883,8 +883,11 @@ static int do_packet_auto_bsf(AVFormatContext *s, AVPacket *pkt) {
 
 #if FF_API_LAVF_MERGE_SD
 FF_DISABLE_DEPRECATION_WARNINGS
-    if (st->internal->nb_bsfcs)
-        av_packet_split_side_data(pkt);
+    if (st->internal->nb_bsfcs) {
+        ret = av_packet_split_side_data(pkt);
+        if (ret < 0)
+            av_log(s, AV_LOG_WARNING, "Failed to split side data before bitstream filter\n");
+    }
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 



More information about the ffmpeg-cvslog mailing list