[FFmpeg-cvslog] Merge commit '72a58c0772450993d375c6cf4b187a068f5bc765' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 11:01:29 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 10:49:37 2014 +0100| [b82860caa7d8cfa2a1ca663422b3c966185d6c1d] | committer: Michael Niedermayer

Merge commit '72a58c0772450993d375c6cf4b187a068f5bc765' into release/2.2

* commit '72a58c0772450993d375c6cf4b187a068f5bc765':
  Update default FATE URL for release/10

Conflicts:
	tests/Makefile

Merge for metadata only as we dont duplicate the fate samples per release branch.
Theres no need for that currently

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

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





More information about the ffmpeg-cvslog mailing list