ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov  6 
12:05:17 2014 +0100| [f74be3669daa8b471fb8919fa980d9bed3207af2] | committer: 
Michael Niedermayer

Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'

* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
  lavc,lavf: switch to the new vorbis parse API

Conflicts:
        libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to