Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 19:17:18 +0000 (21:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 19:17:34 +0000 (21:17 +0200)
* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c

@@@ -1003,8 -944,8 +1003,8 @@@ int ff_mpeg_update_thread_context(AVCod
  #define UPDATE_PICTURE(pic)\
  do {\
      ff_mpeg_unref_picture(s->avctx, &s->pic);\
 -    if (s1->pic.f->buf[0])\
 +    if (s1->pic.f && s1->pic.f->buf[0])\
-         ret = ff_mpeg_ref_picture(s, &s->pic, &s1->pic);\
+         ret = ff_mpeg_ref_picture(s->avctx, &s->pic, &s1->pic);\
      else\
          ret = update_picture_tables(&s->pic, &s1->pic);\
      if (ret < 0)\
Simple merge
Simple merge