diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
| commit | ef9fe5bedd1993700818a0ba1c195cd6f6668afe (patch) | |
| tree | 3c70bf61e4bae16375575e3e6e8dac55fc1ba148 /libavcodec/mjpegdec.c | |
| parent | 238e904df3988ea0253ba08c8b2883e4740565b6 (diff) | |
| parent | a75b9a1804769169456306f570b6716d977ebdc5 (diff) | |
| download | ffmpeg-ef9fe5bedd1993700818a0ba1c195cd6f6668afe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mingw/cygwin: Stop adding -fno-common to gcc CFLAGS
Restructure av_log_missing_feature message
rtp: Support packetization/depacketization of opus
file: Set the return value type for lseek to int64_t.
ppc: fix Altivec build with old compilers
build: add LTO support for PGI compiler
build: add -Mdse to PGI optimisation flags
rtpenc_vp8: Update the packetizer to the latest spec version
rtpdec_vp8: Make the depacketizer implement the latest spec draft
doc: allow building with old texi2html versions
avutil: skip old_pix_fmts.h since it is just a list
Conflicts:
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/utils.c
libavformat/file.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 23d6c9da69..6b5266de58 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -256,8 +256,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } if (s->ls && !(s->bits <= 8 || nb_components == 1)) { av_log_missing_feature(s->avctx, - "only <= 8 bits/component or " - "16-bit gray accepted for JPEG-LS\n", 0); + "For JPEG-LS anything except <= 8 bits/component" + " or 16-bit gray", 0); return AVERROR_PATCHWELCOME; } s->nb_components = nb_components; @@ -286,8 +286,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 is not supported.\n", 0); + av_log_missing_feature(s->avctx, "Subsampling in JPEG-LS", 0); return AVERROR_PATCHWELCOME; } |