git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7323c89
)
lavc/frame_thread_encoder: Do not mix variable declaration and code.
author
Carl Eugen Hoyos
<ceffmpeg@gmail.com>
Mon, 18 Sep 2017 01:24:52 +0000
(
03:24
+0200)
committer
Carl Eugen Hoyos
<ceffmpeg@gmail.com>
Mon, 18 Sep 2017 01:24:52 +0000
(
03:24
+0200)
Fixes a warning:
ISO C90 forbids mixed declarations and code
libavcodec/frame_thread_encoder.c
patch
|
blob
|
history
diff --git
a/libavcodec/frame_thread_encoder.c
b/libavcodec/frame_thread_encoder.c
index
31a9fe9
..
ffbf5ca
100644
(file)
--- 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;