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

Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30' 

* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
	libavcodec/mpegvideo.c

See: 8ef9dcf1d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-11 22:29:40 +02:00
parent 67d29da4bd 0ddc53dabb
commit 67911cc57b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegvideo.c
View File

@ -3231,8 +3231,11 @@ void ff_mpeg_set_erpic(ERPicture *dst, Picture *src)
int i;
memset(dst, 0, sizeof(*dst));
if (!src)
if (!src) {
dst->f = NULL;
dst->tf = NULL;
return;
}
dst->f = src->f;
dst->tf = &src->tf;