diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 02:11:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 02:11:04 +0200 |
| commit | f86b2e4f499a36fd8bb084d7bbd8384ed26ba1cd (patch) | |
| tree | ee8f3cd97baa9ea7aabdc23a2db73cccda0ff483 /libavcodec/dcadec.c | |
| parent | d6373f15869720ac6de93eba61b0a4a7a450d4c9 (diff) | |
| parent | 5a01ab0e62c95a60b4848744e623640f5dafe23b (diff) | |
| download | ffmpeg-f86b2e4f499a36fd8bb084d7bbd8384ed26ba1cd.tar.gz | |
Merge commit '5a01ab0e62c95a60b4848744e623640f5dafe23b' into release/1.1
* commit '5a01ab0e62c95a60b4848744e623640f5dafe23b':
vmd: use the PALETTE_COUNT constant uniformly
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
0 files changed, 0 insertions, 0 deletions