Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 12:07:19 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 12:07:25 +0000 (13:07 +0100)
commit91da6b97c7fb13322faf3dc7f6f895a3e363cdee
tree2ef20ebe1e2b9ab77b03766b70945be5c1bc4e5c
parentb563afe6fa9345a62750055998a28a3926c02334
parent76c40fbef06aaf5013450a4b51dd3c49955777a1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_vp8: Don't trim too much data from broken frames
  rtpdec_vp8: Simplify code by using an existing helper function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_vp8.c