diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:36:21 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:36:21 +0100 |
commit | 7093b7534fd385263f678e48b7ef3177ad58da06 (patch) | |
tree | f25e8668c262b1c38f40814ee4716bec90396fef | |
parent | bf780b7ea8d9420e39f59d565d283806c31de193 (diff) | |
parent | 2240e92f052960693de55cf4924e80426dfaa965 (diff) | |
download | ffmpeg-streaming-7093b7534fd385263f678e48b7ef3177ad58da06.zip ffmpeg-streaming-7093b7534fd385263f678e48b7ef3177ad58da06.tar.gz |
Merge commit '2240e92f052960693de55cf4924e80426dfaa965'
* commit '2240e92f052960693de55cf4924e80426dfaa965':
atomic: Add include guards to the implementation headers
lavc: update the fallback versions of ff_thread_*
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bc1fc0c..59839b9 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2991,7 +2991,6 @@ int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src) int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) { f->owner = avctx; - return ff_get_buffer(avctx, f->f, flags); } |