[FFmpeg-cvslog] Merge commit '641e57230b460bef52c88e61087d97c223910bea'

Michael Niedermayer git at videolan.org
Wed Jun 11 03:19:25 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 11 03:10:21 2014 +0200| [b2fb65cbebba73894a6b98cfa877fddd45f6d124] | committer: Michael Niedermayer

Merge commit '641e57230b460bef52c88e61087d97c223910bea'

* commit '641e57230b460bef52c88e61087d97c223910bea':
  fate: add on2avc audio test

Conflicts:
	tests/fate/audio.mak

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

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





More information about the ffmpeg-cvslog mailing list