aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/time_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-23 12:35:10 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-23 12:35:10 +0200
commitb04b021005508e190ad02b66106c2c611b404a72 (patch)
treea82dcb03f05755ff42f795f9def66587b24eed8c /libavutil/time_internal.h
parent157fa73992ab30b32160034e115aac21808084e2 (diff)
parentae5a8dca675ee544178225256893e679b750cb63 (diff)
downloadffmpeg-b04b021005508e190ad02b66106c2c611b404a72.tar.gz
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
* commit 'ae5a8dca675ee544178225256893e679b750cb63': hap: Fix slice size computation Conflicts: libavcodec/hapdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/time_internal.h')
0 files changed, 0 insertions, 0 deletions