aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/timecode.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-15 13:58:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-15 13:58:38 +0200
commitc4b904caeaa7664870030c3015e1593f90112c9c (patch)
tree0bb83e80faa9f924a40f4b4656cecb40ae7a41a1 /libavutil/timecode.c
parent8e4ecd8774d0841140d4e52e84f6f196c7a7dcfc (diff)
parentf9e5261cab067be7278f73d515bc9b601eb56202 (diff)
downloadffmpeg-c4b904caeaa7664870030c3015e1593f90112c9c.tar.gz
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
* commit 'f9e5261cab067be7278f73d515bc9b601eb56202': indeo: Do not reference mismatched tiles Conflicts: libavcodec/ivi_common.c See: dab70c62d20081bcf879b7b6bc3ffabc2e331542 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.c')
0 files changed, 0 insertions, 0 deletions