Merge remote-tracking branch 'jamrial/release/1.2' into release/1.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 23:20:38 +0000 (01:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 23:20:44 +0000 (01:20 +0200)
* jamrial/release/1.2:
  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>

Trivial merge