mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-22 09:15:06 +02:00
Merge remote-tracking branch 'cus/stable'
* cus/stable: ffplay: limit lowres to the maximum supported. Fixes Ticket591 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8cd210700b
7
ffplay.c
7
ffplay.c
@ -2226,7 +2226,12 @@ static int stream_component_open(VideoState *is, int stream_index)
|
|||||||
|
|
||||||
avctx->workaround_bugs = workaround_bugs;
|
avctx->workaround_bugs = workaround_bugs;
|
||||||
avctx->lowres = lowres;
|
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;
|
avctx->idct_algo= idct;
|
||||||
if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
|
if(fast) avctx->flags2 |= CODEC_FLAG2_FAST;
|
||||||
avctx->skip_frame= skip_frame;
|
avctx->skip_frame= skip_frame;
|
||||||
|
Loading…
Reference in New Issue
Block a user