diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:45:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:52:43 +0100 |
| commit | 7c425e4f2d677477e43cd5ce0d3a5348123b8c2f (patch) | |
| tree | 0cf10f859078c4d6813c3465ebcf13c1ec61c1cf /libavcodec/arm/dca.h | |
| parent | af164d7d9f12f9c2a4b284957eb92ad74cd49b3d (diff) | |
| parent | d7d6efe42b0d2057e67999b96b9a391f533d2333 (diff) | |
| download | ffmpeg-7c425e4f2d677477e43cd5ce0d3a5348123b8c2f.tar.gz | |
Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'
* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
h264: check sps.log2_max_frame_num for validity
mov: validate number of DataReferenceBox entries against box size
mov: compute avg_frame_rate only if duration is known
flac: change minimum and default of lpc_passes option to 1
Conflicts:
libavcodec/h264_ps.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dca.h')
0 files changed, 0 insertions, 0 deletions