RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 467e7a8f26 7ce011e054
commit 5b9917ec2b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/smvjpegdec.c
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,
}; };