diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:51:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:56:43 +0100 |
| commit | f506ae19ffb5ad1366a889b4dbec16254db4b755 (patch) | |
| tree | 041202962161e4fb791cbd9f8ddb98cf90fc9613 /libavcodec/xxan.c | |
| parent | 0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04 (diff) | |
| parent | d243896987b8b2062d1faba4d8d6f0c62d2dbee9 (diff) | |
| download | ffmpeg-f506ae19ffb5ad1366a889b4dbec16254db4b755.tar.gz | |
Merge commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9'
* commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9':
ffv1: fix calculating slice dimensions for version 2
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xxan.c')
0 files changed, 0 insertions, 0 deletions