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)
* commit '9f0617d2137bb7231b181d74392cd84ef4844cd7':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext

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

Simple merge
Simple merge