ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov 13
13:34:39 2014 +0100| [198e55bfa791943fdd477778a8b39180dab52912] | committer:
Michael Niedermayer
Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'
* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
vorbisenc: add missing parenthesis
Conflicts:
libavcodec/vorbisenc.c
See: f72b735d41f9591452d2efe0987040462b409c2d
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=198e55bfa791943fdd477778a8b39180dab52912
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
