ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jul 21
21:35:02 2014 +0200| [79df91bfc403e97e50f3ba0ed9acabeeb5590cd4] | committer:
Michael Niedermayer
Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'
* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
build: Conditionally build and test iirfilter
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79df91bfc403e97e50f3ba0ed9acabeeb5590cd4
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
