[FFmpeg-cvslog] Merge commit '7136a0bf88f31bb8d40a3bbd251963706fb14578' into release/2.4

Michael Niedermayer git at videolan.org
Mon Mar 9 00:43:23 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 00:27:34 2015 +0100| [d208977cd1c47ddc0281186a6f0521b4b4bd6c1a] | committer: Michael Niedermayer

Merge commit '7136a0bf88f31bb8d40a3bbd251963706fb14578' into release/2.4

* commit '7136a0bf88f31bb8d40a3bbd251963706fb14578':
  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=d208977cd1c47ddc0281186a6f0521b4b4bd6c1a
---





More information about the ffmpeg-cvslog mailing list