diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 00:56:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 01:00:50 +0200 |
| commit | a612bb3099eb0319567c3d682253782bee1d52de (patch) | |
| tree | 052bd6982e4ca8b360d9ec5ffe959a6058b60293 /libavcodec/xan.c | |
| parent | 9834874f8c540773f9a727413e38ba2f6b510e2a (diff) | |
| parent | 9fb0de86b49e9fb0709a8ad1e1875e35da841887 (diff) | |
| download | ffmpeg-a612bb3099eb0319567c3d682253782bee1d52de.tar.gz | |
Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'
* commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887':
pcx: Consume the whole packet if giving up due to missing palette
Conflicts:
libavcodec/pcx.c
See: b4e516e30e7004a0454a9009080c4de38987189a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xan.c')
0 files changed, 0 insertions, 0 deletions