diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-03-31 10:40:34 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-31 10:40:34 +0200 |
| commit | e3287077ecff33bd02227b85ec760fe47d796f54 (patch) | |
| tree | d94ccb713264f90ad6048bfab85ef7fb85807fca /libavcodec/mjpegdec.c | |
| parent | b6c293d5e609a7b651c47d3de4749840ae00492e (diff) | |
| parent | 67deba8a416d818f3d95aef0aa916589090396e2 (diff) | |
| download | ffmpeg-e3287077ecff33bd02227b85ec760fe47d796f54.tar.gz | |
Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'
* commit '67deba8a416d818f3d95aef0aa916589090396e2':
Use avpriv_report_missing_feature() where appropriate
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1973132bc6..5470b661c3 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -586,13 +586,13 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) break; default: unk_pixfmt: - av_log(s->avctx, AV_LOG_ERROR, "Unhandled pixel format 0x%x bits:%d\n", pix_fmt_id, s->bits); + avpriv_report_missing_feature(s->avctx, "Pixel format 0x%x bits:%d", pix_fmt_id, s->bits); memset(s->upscale_h, 0, sizeof(s->upscale_h)); memset(s->upscale_v, 0, sizeof(s->upscale_v)); return AVERROR_PATCHWELCOME; } if ((AV_RB32(s->upscale_h) || AV_RB32(s->upscale_v)) && s->avctx->lowres) { - av_log(s->avctx, AV_LOG_ERROR, "lowres not supported for weird subsampling\n"); + avpriv_report_missing_feature(s->avctx, "Lowres for weird subsampling"); return AVERROR_PATCHWELCOME; } if (s->ls) { @@ -1483,8 +1483,9 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, len = get_bits(&s->gb, 16); nb_components = get_bits(&s->gb, 8); if (nb_components == 0 || nb_components > MAX_COMPONENTS) { - av_log(s->avctx, AV_LOG_ERROR, - "decode_sos: nb_components (%d) unsupported\n", nb_components); + avpriv_report_missing_feature(s->avctx, + "decode_sos: nb_components (%d)", + nb_components); return AVERROR_PATCHWELCOME; } if (len != 6 + 2 * nb_components) { |