virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '2240e92f052960693de55cf4924e80426dfaa965'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-03-12 16:36:21 +01:00
parent bf780b7ea8 2240e92f05
commit 7093b7534f
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/utils.c
View File

@@ -2991,7 +2991,6 @@ int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src)
int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
{ {
f->owner = avctx; f->owner = avctx;
return ff_get_buffer(avctx, f->f, flags); return ff_get_buffer(avctx, f->f, flags);
} }