Merge commit '8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:37:39 +0000 (21:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:39:40 +0000 (21:39 +0200)
* commit '8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9':
  mpeg12enc: Add missing #include for PICT_FRAME

See: 9517900bef528527d8507da5a1992f99513d71b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge