diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-07-07 21:23:36 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-07-07 21:23:36 +0000 |
| commit | 0fd0ef7947ad31b2e1b9506cb70d85dcfdf6cba6 (patch) | |
| tree | c79745bc17e836f9438ae968085c2997a5f8c3a5 /libavcodec/mjpegdec.c | |
| parent | 38b04109028fdeb4009f74e7467f90f3083a897a (diff) | |
| download | ffmpeg-0fd0ef7947ad31b2e1b9506cb70d85dcfdf6cba6.tar.gz | |
Add new decoder property max_lowres and do not init decoder if requested value is higher.
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 7f57af905c..47f5a0eb4e 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1542,6 +1542,7 @@ AVCodec mjpeg_decoder = { ff_mjpeg_decode_frame, CODEC_CAP_DR1, NULL, + .max_lowres = 8, .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; @@ -1556,5 +1557,6 @@ AVCodec thp_decoder = { ff_mjpeg_decode_frame, CODEC_CAP_DR1, NULL, + .max_lowres = 3, .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), }; |