diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:28:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:28:18 +0200 |
| commit | a58e10e5d1e9b26733087f536a0eb0c525523218 (patch) | |
| tree | b841939019d6ec46a19f994cbe1938b53362ac4f /libavcodec/ratecontrol.h | |
| parent | 28923f1923ba72804d55012a3b50a302a742f8f1 (diff) | |
| parent | 728214992e3698305550c1762f973d2ac567f016 (diff) | |
| download | ffmpeg-a58e10e5d1e9b26733087f536a0eb0c525523218.tar.gz | |
Merge commit '728214992e3698305550c1762f973d2ac567f016'
* commit '728214992e3698305550c1762f973d2ac567f016':
vc1dec: Remove interlaced warning
vc1dec: Fix mixed field/frame intensity compensation
vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4
vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed
vc1dec: Fix doxy for vc1_mc_4mv_chroma4()
vc1dec: Drop old use_ic code from vc1_b_mc
vc1: Use shuffled use_ic instead of equally shuffled mv_mode
vc1dec: Implement intensity compensation for vc1_interp_mc()
Conflicts:
Changelog
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ratecontrol.h')
0 files changed, 0 insertions, 0 deletions