Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Jan 2015 21:48:15 +0000 (22:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Jan 2015 21:48:24 +0000 (22:48 +0100)
* commit '01168bf1405ddbf671f1074a927b951b8777adbb':
  mpeg: Remove unused field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mpegenc.c

Simple merge