aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-08 03:14:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-18 21:05:12 +0100
commitabaf8c386e6bc5080f5349b66ba31b42110ad84f (patch)
tree7b05c0575e58501f5f1ea5734f0eaa8ec0afde56
parente5578ad3cd96211f48d3d3ed4894f15f82045c1d (diff)
downloadffmpeg-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.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ffplay.c b/ffplay.c
index 6ac8f34fa0..cf7962aa89 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -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;