Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:02:11 +0000 (04:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:02:14 +0000 (04:02 +0100)
* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

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

Simple merge
Simple merge