diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:01:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:01:21 +0100 |
| commit | 06af724c56c9fd74bb6ace457f39e1768bd94246 (patch) | |
| tree | 98871df0ad86390c47e9a6c2fbb6ab2cfa947934 /libavformat/bink.c | |
| parent | 68f92a70f1f486c8bc01a1e747a017a6f8dd6861 (diff) | |
| parent | fb845ffdd335a1efd6dfd43e8adeb530397b348e (diff) | |
| download | ffmpeg-06af724c56c9fd74bb6ace457f39e1768bd94246.tar.gz | |
Merge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e'
* commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e':
h264: add 3 pixels below for subpixel filter wait position
dvdsubdec: Support palette in mkv
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bink.c')
0 files changed, 0 insertions, 0 deletions