diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:25:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:25:01 +0200 |
| commit | 6d33c8ec84904933878e341a8a4a30d3b944458f (patch) | |
| tree | 6f87f79b763f57e79bf5b47d1976a0ff2720df8d /libavutil/parseutils.c | |
| parent | 238532700e841dd06cdd2d66f5842227838f73ba (diff) | |
| parent | fc53a09909ae046dbe4d339bffc744cfc328253e (diff) | |
| download | ffmpeg-6d33c8ec84904933878e341a8a4a30d3b944458f.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions