OSDN Git Service

Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:20:19 +0000 (23:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:20:35 +0000 (23:20 +0100)
commitcdc21e4abe2a0e9394638bb09086ac2068f0683b
tree1eb374ecc67b52b7c34fe15ecb959c369b74d673
parent36068709b3ddc7a0e753039a9e0cab884fc6fb8d
parent9f0617d2137bb7231b181d74392cd84ef4844cd7
Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'

* commit '9f0617d2137bb7231b181d74392cd84ef4844cd7':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext

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