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

Michael Niedermayer git at videolan.org
Mon Jul 15 02:29:24 CEST 2013


ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 15 01:20:38 2013 +0200| [c9ea1f7fc5e92bacf0418ec3be78237827cb9fd1] | committer: Michael Niedermayer

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

* 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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list