diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 03:14:13 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 21:05:12 +0100 |
commit | abaf8c386e6bc5080f5349b66ba31b42110ad84f (patch) | |
tree | 7b05c0575e58501f5f1ea5734f0eaa8ec0afde56 | |
parent | e5578ad3cd96211f48d3d3ed4894f15f82045c1d (diff) | |
download | ffmpeg-abaf8c386e6bc5080f5349b66ba31b42110ad84f.tar.gz |
ffplay: limit lowres to the maximum supported. Fixes Ticket591
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit d8407ee2b1e9f62763a2f47d55f80f7993718c99)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffplay.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -2135,7 +2135,12 @@ static int stream_component_open(VideoState *is, int stream_index) avctx->workaround_bugs = workaround_bugs; avctx->lowres = lowres; - if(lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE; + if(avctx->lowres > codec->max_lowres){ + av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n", + codec->max_lowres); + avctx->lowres= codec->max_lowres; + } + if(avctx->lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE; avctx->idct_algo= idct; if(fast) avctx->flags2 |= CODEC_FLAG2_FAST; avctx->skip_frame= skip_frame; |