ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Sep 4
19:46:06 2014 +0200| [5a20f1885d3b521afc8c63734cff724da0a87815] | committer:
Michael Niedermayer
Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba'
* commit 'f20518568a77a6138fc74021ce56013ab72907ba':
build: Split WMA frequencies into a separate object file
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a20f1885d3b521afc8c63734cff724da0a87815
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
