Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:20:05 +0000 (03:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:20:11 +0000 (03:20 +0100)
* commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809':
  mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext

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

Simple merge
Simple merge
Simple merge