Revision 744a9c75 libavformat/mov.c

View differences:

libavformat/mov.c
600 600
        get_be16(pb); /* reserved */
601 601
        get_be16(pb); /* index */
602 602

  
603
        if (st->codec->codec_tag && st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g')) {
603
        if (st->codec->codec_tag &&
604
            (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id
605
                                   : st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g'))
606
           ){
604 607
            /* multiple fourcc, we skip jpeg, this isnt correct, we should export it as
605 608
               seperate AVStream but this needs a few changes in the mov demuxer, patch
606 609
               welcome */

Also available in: Unified diff