1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not offer smvjpeg lowres capabilities, the decoder does not support it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-07 21:28:24 +02:00
commit 5b9917ec2b

View File

@ -194,7 +194,6 @@ AVCodec ff_smvjpeg_decoder = {
.init = smvjpeg_decode_init, .init = smvjpeg_decode_init,
.close = smvjpeg_decode_end, .close = smvjpeg_decode_end,
.decode = smvjpeg_decode_frame, .decode = smvjpeg_decode_frame,
.max_lowres = 3,
.long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), .long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"),
.priv_class = &smvjpegdec_class, .priv_class = &smvjpegdec_class,
}; };