diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:08:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:08:41 +0100 |
| commit | 150de78d7c9cee65b4095832b25ae353e0d7c7af (patch) | |
| tree | 70259b04cd107d57e81ea9d7eb8b123c24f203e3 /libavcodec/g722dec.c | |
| parent | e5949cc12a7af107e4d4265d711fe77278cce5c9 (diff) | |
| parent | d6d369bf1370999896500ae7eb5b9447ab635a3d (diff) | |
| download | ffmpeg-150de78d7c9cee65b4095832b25ae353e0d7c7af.tar.gz | |
Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'
* commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d':
atomic: prefer gcc builtins over win32 atomics, if available.
avframe: copy reordered_opaque in copy_props
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions