Changes in / [d128794:41572ac6] in ffmpeg


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libavcodec/qdm2.c

    rd128794 r41572ac6  
    16471647    if (!avctx->extradata || (avctx->extradata_size < 48)) {
    16481648        av_log(avctx, AV_LOG_ERROR, "extradata missing or truncated\n");
    1649         return -1;
     1649        return AVERROR_INVALIDDATA;
    16501650    }
    16511651
     
    16631663        av_log(avctx, AV_LOG_ERROR, "not enough extradata (%i)\n",
    16641664               extradata_size);
    1665         return -1;
     1665        return AVERROR_INVALIDDATA;
    16661666    }
    16671667
    16681668    if (memcmp(extradata, "frmaQDM", 7)) {
    16691669        av_log(avctx, AV_LOG_ERROR, "invalid headers, QDM? not found\n");
    1670         return -1;
     1670        return AVERROR_INVALIDDATA;
    16711671    }
    16721672
    16731673    if (extradata[7] == 'C') {
    16741674//        s->is_qdmc = 1;
    1675         av_log(avctx, AV_LOG_ERROR, "stream is QDMC version 1, which is not supported\n");
    1676         return -1;
     1675        avpriv_report_missing_feature(avctx, "QDMC version 1");
     1676        return AVERROR_PATCHWELCOME;
    16771677    }
    16781678
     
    16851685        av_log(avctx, AV_LOG_ERROR, "extradata size too small, %i < %i\n",
    16861686               extradata_size, size);
    1687         return -1;
     1687        return AVERROR_INVALIDDATA;
    16881688    }
    16891689
     
    16921692    if (AV_RB32(extradata) != MKBETAG('Q','D','C','A')) {
    16931693        av_log(avctx, AV_LOG_ERROR, "invalid extradata, expecting QDCA\n");
    1694         return -1;
     1694        return AVERROR_INVALIDDATA;
    16951695    }
    16961696
     
    17611761    // Fail on unknown fft order
    17621762    if ((s->fft_order < 7) || (s->fft_order > 9)) {
    1763         av_log(avctx, AV_LOG_ERROR, "Unknown FFT order (%d), contact the developers!\n", s->fft_order);
    1764         return -1;
     1763        avpriv_request_sample(avctx, "Unknown FFT order %d", s->fft_order);
     1764        return AVERROR_PATCHWELCOME;
    17651765    }
    17661766    if (s->fft_size != (1 << (s->fft_order - 1))) {
     
    18701870
    18711871    for (i = 0; i < 16; i++) {
    1872         if (qdm2_decode(s, buf, out) < 0)
    1873             return -1;
     1872        if ((ret = qdm2_decode(s, buf, out)) < 0)
     1873            return ret;
    18741874        out += s->channels * s->frame_size;
    18751875    }
Note: See TracChangeset for help on using the changeset viewer.