diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 01:45:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 01:47:39 +0100 |
| commit | 720a8d2b7518fd8bf69a5fe470f35dd0cb0aafb6 (patch) | |
| tree | d31ce2ee5db47f40da69f7912d855ccc6ce23cff /libavformat/riff.c | |
| parent | e6e6149630464939fb45b526a90a4dcdb4ff1841 (diff) | |
| parent | 4b39cc1a093c239412ded522c4a899744e7f2008 (diff) | |
| download | ffmpeg-720a8d2b7518fd8bf69a5fe470f35dd0cb0aafb6.tar.gz | |
Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'
* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
riff: support ProRes in avi (APCN fourcc)
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 c63e406be4..8d7b1c2c61 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -362,6 +362,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') }, { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '5') }, { AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') }, + { AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'N') }, { AV_CODEC_ID_NONE, 0 } }; |