Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 09:18:35 +0000 (10:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 09:18:35 +0000 (10:18 +0100)
commit70a65ecabff00a8330a56ceb51b15d10cb5b5389
tree5d50bdef5dee2f182203f0b4d05e5dad013d37a1
parentf023003ce610a8fd6377cf4a8e98002ac3117ef4
parent9a7b56883d1333cdfcdf0fa7584a333841b86114
Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'

* commit '9a7b56883d1333cdfcdf0fa7584a333841b86114':
  au: set bit rate
  au: validate bits-per-sample separately from codec tag
  rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT

Conflicts:
libavformat/au.c

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