ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov  6 
10:50:59 2014 +0100| [a0617025dd264ba1db6a3dccfaed942ba0dd2bbe] | committer: 
Michael Niedermayer

Merge commit '8747926'

* commit '8747926':
  vorbis_parser: use a dedicated AVClass for logging

Conflicts:
        libavcodec/vorbis_parser.c

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

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



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

Reply via email to