Merge remote-tracking branch 'jamrial/release/1.0' into release/1.0
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Jul 2013 23:17:36 +0000 (01:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Jul 2013 23:17:41 +0000 (01:17 +0200)
commitb8b73739141eadcd6a685c8c5d69cfb59c5530df
tree11d580ff7638debe20058e7589e815fd0359b3e2
parentd46713cc7e7dfd88b813078a71ed1c29e42011ca
parentbe23cee317f52f3dffa49812f412c0041d8b0de3
Merge remote-tracking branch 'jamrial/release/1.0' into release/1.0

* jamrial/release/1.0:
  oggparseskeleton: avoid header parsing failure
  oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call
  oggparseskeleton: Fix fisbone header parsing

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