Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'

* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
  riff: support ProRes in avi (APCN fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/riff.c
index c63e406,b91f8f1..8d7b1c2
--- 1/libavformat/riff.c
--- 2/libavformat/riff.c
+++ b/libavformat/riff.c
@@@ -360,8 -346,8 +360,9 @@@ const AVCodecTag ff_codec_bmp_tags[] = 
      { AV_CODEC_ID_G2M,          MKTAG('G', '2', 'M', '2') },
      { AV_CODEC_ID_G2M,          MKTAG('G', '2', 'M', '3') },
      { 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 }
  };