[FFmpeg-cvslog] Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'

Michael Niedermayer git at videolan.org
Fri Apr 19 23:18:51 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 19 23:11:44 2013 +0200| [6c5989cce9e3ef93766a3c62096d4a08ee4be7c1] | committer: Michael Niedermayer

Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'

* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
  fate: Split audio filters into their own separate file

Conflicts:
	tests/Makefile
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list