diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:30:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:30:19 +0100 |
| commit | fa92ee821bba1d3c2a497ed22e41927b552856f8 (patch) | |
| tree | 26bb0752049f1abb82e03e127f175ff2c0b78387 /libavcodec/mjpegdec.c | |
| parent | 905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff) | |
| parent | 63d744e2be39466e3a734c2987cd713e0bac101e (diff) | |
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()
Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b7d4cf5995..e38922ba85 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -260,9 +260,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } } if (s->ls && !(s->bits <= 8 || nb_components == 1)) { - av_log_missing_feature(s->avctx, - "For JPEG-LS anything except <= 8 bits/component" - " or 16-bit gray", 0); + avpriv_report_missing_feature(s->avctx, + "JPEG-LS that is not <= 8 " + "bits/component or 16-bit gray"); return AVERROR_PATCHWELCOME; } s->nb_components = nb_components; @@ -295,7 +295,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } if (s->ls && (s->h_max > 1 || s->v_max > 1)) { - av_log_missing_feature(s->avctx, "Subsampling in JPEG-LS", 0); + avpriv_report_missing_feature(s->avctx, "Subsampling in JPEG-LS"); return AVERROR_PATCHWELCOME; } |