[FFmpeg-cvslog] ffmpeg: Check avcodec_parameters_to_context() for failure

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Dec 26 20:25:23 2016 +0100| [11103a493de5f07a61c6f4f1c37a290fdc8942cb] | committer: Michael Niedermayer

ffmpeg: Check avcodec_parameters_to_context() for failure

Fixes CID1396241

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

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

 ffmpeg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index e4890a4..ec9da3e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2877,8 +2877,9 @@ static int init_output_stream_streamcopy(OutputStream *ost)
 
     av_assert0(ist && !ost->filter);
 
-    avcodec_parameters_to_context(ost->enc_ctx, ist->st->codecpar);
-    ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
+    ret = avcodec_parameters_to_context(ost->enc_ctx, ist->st->codecpar);
+    if (ret >= 0)
+        ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
     if (ret < 0) {
         av_log(NULL, AV_LOG_FATAL,
                "Error setting up codec context options.\n");