[FFmpeg-cvslog] Merge commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a' into release/2.4

Michael Niedermayer git at videolan.org
Sat Oct 4 23:20:21 CEST 2014


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  4 23:01:31 2014 +0200| [4f4f78ea48d84f32f5ed9447a2f9174020196e89] | committer: Michael Niedermayer

Merge commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a' into release/2.4

* commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a':
  Update default FATE URL for release/11

Conflicts:
	tests/Makefile

no change, as we do not have per release reference samples

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

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





More information about the ffmpeg-cvslog mailing list