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

mpeg12dec: avoid reinitialization on PS changes when possible. 

Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 970c8df735)

Conflicts:
	libavcodec/mpeg12dec.c
This commit is contained in:
Michael Niedermayer 2013-07-08 21:46:20 +02:00 committed by Carl Eugen Hoyos
parent e445dc9237
commit f75964ad1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg12.c
View File

@ -1250,7 +1250,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
s1->save_width != s->width || s1->save_width != s->width ||
s1->save_height != s->height || s1->save_height != s->height ||
s1->save_aspect_info != s->aspect_ratio_info || s1->save_aspect_info != s->aspect_ratio_info ||
s1->save_progressive_seq != s->progressive_sequence || (s1->save_progressive_seq != s->progressive_sequence && (s->height&31)) ||
0) 0)
{ {