Merge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 21:14:07 +0000 (23:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 21:14:07 +0000 (23:14 +0200)
commit6101187c5501c302350d01f50d5aa7f76a6b4ce5
tree7ec0490c0e0dff755b4179838450af17b14a476d
parent91ff803a748c273044e7a1dc36cdd4cfff4d079a
parentce0972ecddef3eee3c03e393108e5728821e3e37
Merge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4

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

Conflicts:
libavcodec/mpeg12dec.c

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