[FFmpeg-cvslog] Merge commit 'fc53a09909ae046dbe4d339bffc744cfc328253e' into release/1.1

Michael Niedermayer git at videolan.org
Mon Apr 21 14:32:03 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:25:01 2014 +0200| [6d33c8ec84904933878e341a8a4a30d3b944458f] | committer: Michael Niedermayer

Merge commit 'fc53a09909ae046dbe4d339bffc744cfc328253e' into release/1.1

* commit 'fc53a09909ae046dbe4d339bffc744cfc328253e':
  cmdutils: update copyright year to 2014.

Conflicts:
	cmdutils.c

No change as the copyright year has already been fixed

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

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





More information about the ffmpeg-cvslog mailing list