diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-02 04:48:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-02 04:48:47 +0200 |
| commit | 96cb1438000075cae2a7f33a1b794df27f18284b (patch) | |
| tree | b333a2202a920ba5f47494479feb6709b493cdc8 /libavformat/riff.c | |
| parent | 571572fcddc16ebe3d60054ae5a2db05800c1d6d (diff) | |
| parent | 91c86d3cf8064b3ff28c66a48d3e0c7187df1ab8 (diff) | |
| download | ffmpeg-96cb1438000075cae2a7f33a1b794df27f18284b.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
Canopus Lossless decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 04419ed317..bf14c45d5c 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -315,6 +315,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MSA1, MKTAG('M', 'S', 'A', '1') }, { CODEC_ID_TSCC2, MKTAG('T', 'S', 'C', '2') }, { CODEC_ID_MTS2, MKTAG('M', 'T', 'S', '2') }, + { CODEC_ID_CLLC, MKTAG('C', 'L', 'L', 'C') }, { CODEC_ID_NONE, 0 } }; |