aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/sctp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-31 01:46:25 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-10-31 01:46:25 +0100
commit8065a0cdbed7c909bdbdd4708368e6096db3752b (patch)
tree6fa0ae72b886cd9bbe32c23fc2c9a984b865608d /libavformat/sctp.c
parentf76cd09d466efffdb51b418ce2ce34c7a7e6d342 (diff)
parentcf589faa5b7aed3bb38e08dcd00bd951e69686d1 (diff)
downloadffmpeg-8065a0cdbed7c909bdbdd4708368e6096db3752b.tar.gz
Merge commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1'
* commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1': movenc: Add a flag for using default-base-is-moof in tfhd atoms Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sctp.c')
0 files changed, 0 insertions, 0 deletions