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)
commit98d6f0ffef30d29708b3b719be56bc84b3738b89
tree0395bc3cc60f07ad420c46fdc598bca2996ee614
parentc96a44d0ddb063cf5c3d5b4fb2e46d3ca2309ba0
parent37b3361e755361d4ff14a2973df001c0140d98d6
Merge commit '37b3361e755361d4ff14a2973df001c0140d98d6'

* commit '37b3361e755361d4ff14a2973df001c0140d98d6':
  mpeg12enc: factor out check in encode_dc

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