diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-12 16:36:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-12 16:36:21 +0100 |
| commit | 7093b7534fd385263f678e48b7ef3177ad58da06 (patch) | |
| tree | f25e8668c262b1c38f40814ee4716bec90396fef /ffmpeg_opt.c | |
| parent | bf780b7ea8d9420e39f59d565d283806c31de193 (diff) | |
| parent | 2240e92f052960693de55cf4924e80426dfaa965 (diff) | |
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 <[email protected]>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions