Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 12:36:32 +0000 (13:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 12:37:34 +0000 (13:37 +0100)
* qatar/release/0.5:
  mpeg12: do not decode extradata more than once.

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

Trivial merge