[FFmpeg-cvslog] lavc/frame_thread_encoder: Do not mix variable declaration and code.

Carl Eugen Hoyos git at videolan.org
Mon Sep 18 04:26:02 EEST 2017


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Mon Sep 18 03:24:52 2017 +0200| [3118e81f86067e8f04d729b070fc90ca2c9090d8] | committer: Carl Eugen Hoyos

lavc/frame_thread_encoder: Do not mix variable declaration and code.

Fixes a warning:
ISO C90 forbids mixed declarations and code

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

 libavcodec/frame_thread_encoder.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 31a9fe9dae..ffbf5caf29 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -193,13 +193,14 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
 
     for(i=0; i<avctx->thread_count ; i++){
         AVDictionary *tmp = NULL;
+        int ret;
         void *tmpv;
         AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec);
         if(!thread_avctx)
             goto fail;
         tmpv = thread_avctx->priv_data;
         *thread_avctx = *avctx;
-        int ret = av_opt_copy(thread_avctx, avctx);
+        ret = av_opt_copy(thread_avctx, avctx);
         if (ret < 0)
             goto fail;
         thread_avctx->priv_data = tmpv;



More information about the ffmpeg-cvslog mailing list