[FFmpeg-cvslog] Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'

Michael Niedermayer git at videolan.org
Fri Oct 24 16:20:54 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 14:48:12 2014 +0200| [e744e9a305896d8cbe3c06951b0a7e535ccd8562] | committer: Michael Niedermayer

Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'

* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
  mp3enc: write full LAME frame

Conflicts:
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e744e9a305896d8cbe3c06951b0a7e535ccd8562
---





More information about the ffmpeg-cvslog mailing list