Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 01:38:12 +0000 (03:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 01:38:48 +0000 (03:38 +0200)
commitbe5dd8aa5558cabe256c78de0ec8063f5810b96f
treef11ab629c1a914261b6e0438d2b8375d8c30d906
parent28b1698a7cccded1df32a543321fd24af928e06c
parent4e03b2097ca59843ed65424a572b7acd5345f088
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'

* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
libavcodec/mpeg12dec.c

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