[FFmpeg-cvslog] Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'
Michael Niedermayer
git at videolan.org
Sun Mar 8 19:41:21 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 8 19:09:32 2015 +0100| [acfb54c076e25b5f228ab07d364738940e4171d3] | committer: Michael Niedermayer
Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'
* commit '0025f7408a0fab2cab4a950064e4784a67463994':
vorbis: Check the vlc value in setup_classifs
Conflicts:
libavcodec/vorbisdec.c
See: ae038c0914460646503be083e30e3971093239a1
See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acfb54c076e25b5f228ab07d364738940e4171d3
---
More information about the ffmpeg-cvslog
mailing list