Merge commit '37b3361e755361d4ff14a2973df001c0140d98d6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 16:28:06 +0000 (17:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 16:28:40 +0000 (17:28 +0100)
* commit '37b3361e755361d4ff14a2973df001c0140d98d6':
  mpeg12enc: factor out check in encode_dc

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

Simple merge