diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 09:28:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 09:28:23 +0200 |
| commit | 6635b13411a8a9399e57c73b79a16c60d6505a03 (patch) | |
| tree | d7a3a711af06e711c405b3ddb8954b3c7d046566 /libavcodec/mlp.h | |
| parent | 63e5e9f7c5ad10d522bd6fd247c54c037d3b3aa9 (diff) | |
| parent | 91a6944e56236234f0a7ba162404665753cbcb51 (diff) | |
| download | ffmpeg-6635b13411a8a9399e57c73b79a16c60d6505a03.tar.gz | |
Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'
* commit '91a6944e56236234f0a7ba162404665753cbcb51':
vmd: use the PALETTE_COUNT constant uniformly
Conflicts:
libavcodec/vmdav.c
No change as the changed line does not exist in ffmpegs vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp.h')
0 files changed, 0 insertions, 0 deletions