aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mxf.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-30 10:19:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-30 10:19:20 +0200
commitef1544740e023c26d93f9b11904ad1725139d5e7 (patch)
tree49289442c633f7495a778ae27b92bdf25a2a5dc8 /libavformat/mxf.h
parent4971551fd215b8c7e9f3e20fc1536bb2150c84b4 (diff)
parenta2b7eeeb06471979ee39fd3075a04633222678a6 (diff)
downloadffmpeg-ef1544740e023c26d93f9b11904ad1725139d5e7.tar.gz
Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'
* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6': hlsproto: Store all durations in AV_TIME_BASE Conflicts: libavformat/hlsproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.h')
0 files changed, 0 insertions, 0 deletions