[FFmpeg-cvslog] Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'
Michael Niedermayer
git at videolan.org
Mon Mar 31 02:17:55 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 02:15:11 2014 +0200| [801b94a78294cd90efc1e87fb1f03948203e88db] | committer: Michael Niedermayer
Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'
* commit '729d821fd864a0568f4068e64d3a70faa23b9309':
libmp3lame: allow joint stereo to be disabled
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: 1de11a7cab5346030a134774fbc23b3fc523a003
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=801b94a78294cd90efc1e87fb1f03948203e88db
---
More information about the ffmpeg-cvslog
mailing list