Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Mar 2014 00:14:59 +0000 (01:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Mar 2014 00:46:29 +0000 (01:46 +0100)
* qatar/master:
  ituh263: reject b-frame with pp_time = 0

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

Trivial merge