Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'

* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
  riff: Support ProRes in avi (APCH fourcc)

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

diff --cc libavformat/riff.c
index 8d7b1c2,a093986..b90e408
--- 1/libavformat/riff.c
--- 2/libavformat/riff.c
+++ b/libavformat/riff.c
@@@ -360,9 -347,9 +360,10 @@@ 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_PRORES,       MKTAG('A', 'P', 'C', 'H') },
      { AV_CODEC_ID_NONE,         0 }
  };