aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/isom.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-18 01:29:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-18 01:29:31 +0100
commitb6cd6da17329d65922626ff71eabdeff2e692032 (patch)
treedba644ba851a517bfb896148a30307f52ffef186 /libavformat/isom.h
parentd3316c3f85c291f6875e3cc56dae2ccea1f15f09 (diff)
parent8a982092cc3436c25d68ec15b27277c176ce0061 (diff)
downloadffmpeg-b6cd6da17329d65922626ff71eabdeff2e692032.tar.gz
Merge commit '8a982092cc3436c25d68ec15b27277c176ce0061' into release/2.4
* commit '8a982092cc3436c25d68ec15b27277c176ce0061': mxfdec: add missing break See: cbda76c7c65c5c0a4d5de03baad96c4a940c7336 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
0 files changed, 0 insertions, 0 deletions