diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 19:30:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 19:30:57 +0100 |
| commit | d6acf45ec280be866698966947a0887841a6ea20 (patch) | |
| tree | cd33128f533bf6275562c8ab33c7bb2ea36f90b4 /libavformat/xwma.c | |
| parent | 4e1dc600a16e1ba302d7ac707670e4f6129d1dde (diff) | |
| parent | 3d9fc21e593aa89b5877bd739268499b079052f2 (diff) | |
| download | ffmpeg-d6acf45ec280be866698966947a0887841a6ea20.tar.gz | |
Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'
* commit '3d9fc21e593aa89b5877bd739268499b079052f2':
h264: Refactor decode_frame_packing_arrangement
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/xwma.c')
0 files changed, 0 insertions, 0 deletions