diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 02:59:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:00:04 +0200 |
| commit | 28923f1923ba72804d55012a3b50a302a742f8f1 (patch) | |
| tree | 755f8d40a71b6058666e53b1c1e4a70811de5a89 /ffmpeg_filter.c | |
| parent | 4f4c91d47487d4d92bee83888f8e8382cadadf46 (diff) | |
| parent | 28243b0d35b47bbf9abbd454fc444a6e0a9e7b71 (diff) | |
| download | ffmpeg-28923f1923ba72804d55012a3b50a302a742f8f1.tar.gz | |
Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'
* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
vc1dec: Redesign the intensity compensation
Conflicts:
libavcodec/vc1.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions