diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:42:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:42:54 +0100 |
| commit | 97bd0e2a93f1a36b377ebb181ba0fe56e93e6c03 (patch) | |
| tree | ce6a380a5d7a037b11bba77e32d0f37e50d38683 /libavformat | |
| parent | d06dce21a454f541acec329aa5299e67cd9d0994 (diff) | |
| parent | c78dc12118cb5b2a69a17f38c69f77a42e89a9c4 (diff) | |
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 8d7b1c2c61..b90e40873e 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -363,6 +363,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { 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_PRORES, MKTAG('A', 'P', 'C', 'H') }, { AV_CODEC_ID_NONE, 0 } }; |