diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 21:28:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 21:38:54 +0200 |
| commit | 5b9917ec2b1372015390ee4fe82b56a55f463d55 (patch) | |
| tree | 4930413ba2c57887819bf1a0f9c3f6310f757961 /libavcodec/smvjpegdec.c | |
| parent | 467e7a8f26e54c300ba494bf00033fec1078fa45 (diff) | |
| parent | 7ce011e054d1a5c3ae18149b96ef87b05175c55e (diff) | |
| download | ffmpeg-5b9917ec2b1372015390ee4fe82b56a55f463d55.tar.gz | |
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>
Diffstat (limited to 'libavcodec/smvjpegdec.c')
| -rw-r--r-- | libavcodec/smvjpegdec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index efd2fa25d8..4897575746 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -194,7 +194,6 @@ AVCodec ff_smvjpeg_decoder = { .init = smvjpeg_decode_init, .close = smvjpeg_decode_end, .decode = smvjpeg_decode_frame, - .max_lowres = 3, .long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), .priv_class = &smvjpegdec_class, }; |