diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:10:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:10:25 +0200 |
| commit | 853a93804d16c79028ba8005d4c033a403fc34f9 (patch) | |
| tree | 19778ac21caaa269684c4b04ed981ea9921b92f1 /libpostproc/postprocess_internal.h | |
| parent | e5ce6d447b952658b8a8568c807baeab5cf58783 (diff) | |
| parent | d9a2e87b1ce44cce23801e7ec6810f8bf994fa23 (diff) | |
| download | ffmpeg-853a93804d16c79028ba8005d4c033a403fc34f9.tar.gz | |
Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'
* commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23':
mpeg12: move mpeg_decode_frame() lower
avsdec: Set dimensions instead of relying on the demuxer.
wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.
Conflicts:
libavcodec/avs.c
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess_internal.h')
0 files changed, 0 insertions, 0 deletions