diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:50:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:51:39 +0100 |
| commit | 77ae94727f04e2c5d7d756733005163fde4d96a1 (patch) | |
| tree | 36dd79181809882ee31b664ce66374b717657ebf | |
| parent | 97bd0e2a93f1a36b377ebb181ba0fe56e93e6c03 (diff) | |
| parent | 195942ed9b9b563ec86d34b73aa2c1ee8715d59d (diff) | |
| download | ffmpeg-77ae94727f04e2c5d7d756733005163fde4d96a1.tar.gz | |
Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 b90e40873e..0f0cb4bf3b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -364,6 +364,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') }, { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'N') }, { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'H') }, + { AV_CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, { AV_CODEC_ID_NONE, 0 } }; |