[FFmpeg-cvslog] Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'

Michael Niedermayer git at videolan.org
Fri Mar 28 04:45:26 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 04:41:16 2014 +0100| [8a8472dd49d720f8c5bbe54cad17651542af7d81] | committer: Michael Niedermayer

Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'

* commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8':
  fate: add PAF audio and video tests

Conflicts:
	tests/fate/audio.mak
	tests/fate/video.mak

See: 101615c7ff37afe5e6a951838cbbbb92b7485473
See: 409cc4588329633326b32a5245b085c543689471
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list