diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:31:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:31:57 +0200 |
| commit | a05f86ec101f2c3ee48758f03fca3125dbbf83b8 (patch) | |
| tree | f3ae4a4d63a36bc551df04fba518fb0a57629448 /libavutil/timecode.c | |
| parent | 9bdb254b980fef48bead17197a2821ca06509301 (diff) | |
| parent | 8e9e57ed0c7f40741da1ca83e52c851263e0c168 (diff) | |
| download | ffmpeg-a05f86ec101f2c3ee48758f03fca3125dbbf83b8.tar.gz | |
Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2
* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168':
Update Changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.c')
0 files changed, 0 insertions, 0 deletions