ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri 
Jul 17 21:42:14 2015 +0200| [948a15195c69da2ff9a4b0ac7df782ba1cc2795f] | 
committer: Michael Niedermayer

Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'

* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
  configure: Factor out flacdsp module

Conflicts:
        configure
        libavcodec/Makefile
        libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to