Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 20:29:40 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 20:30:49 +0000 (22:30 +0200)
* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
libavcodec/mpegvideo.c

See: 8ef9dcf1d74aea55bf39f1e479fe67e98d973954
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c

index af491b9..b8096cc 100644 (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;