ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e744e9a305896d8cbe3c06951b0a7e535ccd8562
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
