ffmpeg | branch: release/1.1 | Johan Andersson | Sat Jan 3
17:31:36 2015 +0100| [77c201982b48ddef15784217e786200853f3] | committer:
Michael Niedermayer
cmdutils: update copyright year to 2015.
(cherry picked from commit 3e160652219ff4da433f5672ae1e5f4956abb815)
Conflicts:
cmduti
ffmpeg | branch: release/0.10 | Johan Andersson | Sat Jan 3
17:31:36 2015 +0100| [b3242c0f2293e2fac8c80c3bfb444d6d20f29bb2] | committer:
Michael Niedermayer
cmdutils: update copyright year to 2015.
(cherry picked from commit 3e160652219ff4da433f5672ae1e5f4956abb815)
Conflicts:
cmdut
ffmpeg | branch: release/1.2 | Johan Andersson | Sat Jan 3
17:31:36 2015 +0100| [5410d6d26fc603df80915a9bce863cbcd3eb1fc4] | committer:
Michael Niedermayer
cmdutils: update copyright year to 2015.
(cherry picked from commit 3e160652219ff4da433f5672ae1e5f4956abb815)
Conflicts:
cmduti
ffmpeg | branch: master | Johan Andersson | Sat Jan 3 17:31:36
2015 +0100| [3e160652219ff4da433f5672ae1e5f4956abb815] | committer: Martin
Storsjö
cmdutils: update copyright year to 2015.
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e160652219ff4
