OSDN Git Service

Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:54:35 +0000 (03:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:55:39 +0000 (03:55 +0100)
commit1897c4a119d26a4f4781383497c2ab646cf60fe7
tree757b9d985e397f160954b8f280f9ff21a77be205
parent47e5eaf8c9869e8e34e96252b8eeaabec7bcc894
parent3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab
Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'

* commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab':
  mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

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