diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 11:32:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 12:03:23 +0100 |
| commit | e1d10017039de37d1311892fcd49bd936777a196 (patch) | |
| tree | 4a8dab3dc675d5e86143722d926d7450c4f3efee /libavcodec/cinepakenc.c | |
| parent | a696b0917d1d1ef5b0dee691786ddb51ee4ab519 (diff) | |
| parent | e8e560f2a20e59789cafef174b382054ad9721ea (diff) | |
| download | ffmpeg-e1d10017039de37d1311892fcd49bd936777a196.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add a bmpparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepakenc.c')
0 files changed, 0 insertions, 0 deletions