Revision 0941ee0f

View differences:

libavcodec/rawdec.c
74 74

  
75 75
    if (avctx->codec_tag == MKTAG('r','a','w',' '))
76 76
        avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_coded_sample);
77
    else if (avctx->codec_tag == MKTAG('A', 'V', 'R', 'n'))
78
        avctx->pix_fmt = PIX_FMT_UYVY422; // Avid AVI Codec "Resolution 1:1"
77 79
    else if (avctx->codec_tag)
78 80
        avctx->pix_fmt = findPixelFormat(ff_raw_pixelFormatTags, avctx->codec_tag);
79 81
    else if (avctx->bits_per_coded_sample)
libavformat/avidec.c
518 518
                    st->codec->codec_tag = tag1;
519 519
                    st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
520 520
                    st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts.
521
                    // Support "Resolution 1:1" for Avid AVI Codec
522
                    if(tag1 == MKTAG('A', 'V', 'R', 'n') &&
523
                       st->codec->extradata_size >= 31 &&
524
                       !memcmp(&st->codec->extradata[28], "1:1", 3))
525
                        st->codec->codec_id = CODEC_ID_RAWVIDEO;
521 526

  
522 527
                    if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){
523 528
                        st->codec->extradata_size+= 9;

Also available in: Unified diff