OSDN Git Service

Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 01:52:09 +0000 (02:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 01:52:09 +0000 (02:52 +0100)
commitb4ef7447eb16fc947110d86ebb4593066e524ae1
tree477d6750fbd35ab75429072df898a9a3227346e9
parentec5499d8bac82007bfc966fb1a7b8233375723cf
parent43af264de8606668c6b2fa7f96c946bdc3dbe072
Merge commit '43af264de8606668c6b2fa7f96c946bdc3dbe072'

* commit '43af264de8606668c6b2fa7f96c946bdc3dbe072':
  mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

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