ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Nov 21
21:02:17 2014 +0100| [5af0a701a1c0356fd1a79671de1cf06974e78d76] | committer:
Michael Niedermayer
Merge commit 'aa8b39d999589154f79300de9038994d0093cd34'
* commit 'aa8b39d999589154f79300de9038994d0093cd34':
lavc: Move the libtwolame encoder registration to the list for external
libraries
Conflicts:
libavcodec/allcodecs.c
See: f5f98727b361c62d3962cef37a100db95d62b702
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5af0a701a1c0356fd1a79671de1cf06974e78d76
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
