OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'qatar/master'
[coroid/ffmpeg_saccubus.git]
/
libavcodec
/
utils.c
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
356e21f
..
301e33e
100644
(file)
--- a/
libavcodec/utils.c
+++ b/
libavcodec/utils.c
@@
-1159,7
+1159,7
@@
void avcodec_flush_buffers(AVCodecContext *avctx)
{
if(HAVE_PTHREADS && avctx->active_thread_type&FF_THREAD_FRAME)
ff_thread_flush(avctx);
- if(avctx->codec->flush)
+
else
if(avctx->codec->flush)
avctx->codec->flush(avctx);
}