[FFmpeg-cvslog] Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1

Michael Niedermayer git at videolan.org
Mon Jul 15 03:11:11 CEST 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 15 02:34:49 2013 +0200| [9260710739862db94aa1f66a827115a1d89c5361] | committer: Michael Niedermayer

Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1

* jamrial/release/1.1:
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9260710739862db94aa1f66a827115a1d89c5361
---





More information about the ffmpeg-cvslog mailing list