aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/timecode.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-11 17:03:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-11 17:03:53 +0200
commita14969253a6cbb2958bf7c39acbb7d0056219111 (patch)
tree17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7 /libavutil/timecode.c
parentfab9a7be76eec79c1dab4974307628bbe00d3a46 (diff)
parent6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5 (diff)
downloadffmpeg-a14969253a6cbb2958bf7c39acbb7d0056219111.tar.gz
Merge commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5' into release/2.2
* commit '6c3985713b77c5c1155f31c3fbb8236f9b4cdfb5': Add missing changelog entries for v10 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.c')
0 files changed, 0 insertions, 0 deletions