Changes in / [d128794:41572ac6] in ffmpeg
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libavcodec/qdm2.c
rd128794 r41572ac6 1647 1647 if (!avctx->extradata || (avctx->extradata_size < 48)) { 1648 1648 av_log(avctx, AV_LOG_ERROR, "extradata missing or truncated\n"); 1649 return -1;1649 return AVERROR_INVALIDDATA; 1650 1650 } 1651 1651 … … 1663 1663 av_log(avctx, AV_LOG_ERROR, "not enough extradata (%i)\n", 1664 1664 extradata_size); 1665 return -1;1665 return AVERROR_INVALIDDATA; 1666 1666 } 1667 1667 1668 1668 if (memcmp(extradata, "frmaQDM", 7)) { 1669 1669 av_log(avctx, AV_LOG_ERROR, "invalid headers, QDM? not found\n"); 1670 return -1;1670 return AVERROR_INVALIDDATA; 1671 1671 } 1672 1672 1673 1673 if (extradata[7] == 'C') { 1674 1674 // 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; 1677 1677 } 1678 1678 … … 1685 1685 av_log(avctx, AV_LOG_ERROR, "extradata size too small, %i < %i\n", 1686 1686 extradata_size, size); 1687 return -1;1687 return AVERROR_INVALIDDATA; 1688 1688 } 1689 1689 … … 1692 1692 if (AV_RB32(extradata) != MKBETAG('Q','D','C','A')) { 1693 1693 av_log(avctx, AV_LOG_ERROR, "invalid extradata, expecting QDCA\n"); 1694 return -1;1694 return AVERROR_INVALIDDATA; 1695 1695 } 1696 1696 … … 1761 1761 // Fail on unknown fft order 1762 1762 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; 1765 1765 } 1766 1766 if (s->fft_size != (1 << (s->fft_order - 1))) { … … 1870 1870 1871 1871 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; 1874 1874 out += s->channels * s->frame_size; 1875 1875 }
Note:
See TracChangeset
for help on using the changeset viewer.