ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov 6
11:00:42 2014 +0100| [5f7887ca8d056d2debdd2c3b205ada7305d9ac07] | committer:
Michael Niedermayer
Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'
* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67':
vorbis_parser: add an AV prefix to VorbisParseContext
Conflicts:
libavcodec/vorbis_parser.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f7887ca8d056d2debdd2c3b205ada7305d9ac07
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
