[FFmpeg-cvslog] Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'

[Matthieu Bouron]

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Wed Jul 13 16:56:20 2016 +0200| [354336490da0c1ee2c887bbf8f25b46610233608] | committer: Matthieu Bouron

Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'

* commit '846a3e78a535f05ee61bb23a160f3378f041f751':
  mov: Support prores with multiple stsd

Merged-by: Matthieu Bouron <matthieu.bouron at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=354336490da0c1ee2c887bbf8f25b46610233608
---

 libavformat/mov.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 756d0e8..2712364 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2205,6 +2205,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
 
     if (codec_tag &&
          (codec_tag != format &&
+          // prores is allowed to have differing data format and codec tag
+          codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
           (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
                                  : codec_tag != MKTAG('j','p','e','g')))) {
         /* Multiple fourcc, we skip JPEG. This is not correct, we should


======================================================================

diff --cc libavformat/mov.c
index 756d0e8,fe1f264..2712364
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -2204,9 -1771,13 +2204,11 @@@ static int mov_skip_multiple_stsd(MOVCo
      int video_codec_id = ff_codec_get_id(ff_codec_movvideo_tags, format);
  
      if (codec_tag &&
 -        (codec_tag == AV_RL32("hvc1") ||
 -         codec_tag == AV_RL32("hev1") ||
           (codec_tag != format &&
+           // prores is allowed to have differing data format and codec tag
+           codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
            (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
 -                                 : codec_tag != MKTAG('j','p','e','g'))))) {
 +                                 : codec_tag != MKTAG('j','p','e','g')))) {
          /* Multiple fourcc, we skip JPEG. This is not correct, we should
           * export it as a separate AVStream but this needs a few changes
           * in the MOV demuxer, patch welcome. */