Merge commit '4b39cc1a'

* commit '4b39cc1a':
  riff: support ProRes in avi (APCN fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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 }
 };