diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:23:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:23:53 +0100 |
| commit | 67999d3d1275d2e1449946a5f838e5d1933a8439 (patch) | |
| tree | 9ae1b43fd8b43c7202f0ed279aa49fdf7dfc2049 /libswscale | |
| parent | d18234f31915f5aba523ade54ff75aab062c647f (diff) | |
| parent | 7ce88e5ec41484c452da56853a6897803da9c2a5 (diff) | |
| download | ffmpeg-67999d3d1275d2e1449946a5f838e5d1933a8439.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmdutils: update copyright year to 2014.
Conflicts:
cmdutils.c
See: 0b1cfc4f28d81a8a49fdd5589b2eed06477abd61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions