Commit 97bd0e2a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c78dc121'

* commit 'c78dc121':
  riff: Support ProRes in avi (APCH fourcc)
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d06dce21 c78dc121
...@@ -363,6 +363,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -363,6 +363,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '5') }, { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '5') },
{ AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') }, { 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', 'N') },
{ AV_CODEC_ID_PRORES, MKTAG('A', 'P', 'C', 'H') },
{ AV_CODEC_ID_NONE, 0 } { AV_CODEC_ID_NONE, 0 }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment