OSDN Git Service

Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:39:56 +0000 (03:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:40:09 +0000 (03:40 +0100)
commitf4c28aea38aeda38d233c57fa6e0a2f52e1f5416
tree700b1cf6444849e4bdc6d96512641c0785a832a9
parent0cea39fdd310caaec96f5fe985fe7fcf8dcf38da
parent8cebc9eaac8631adb23dd1e46c37ad8474139a07
Merge commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07'

* commit '8cebc9eaac8631adb23dd1e46c37ad8474139a07':
  mpeg4videodec: remove a write-only variable from MpegEncContext

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