aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-26 11:27:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-26 11:27:17 +0100
commitb78074fd13ad340b8ea4bb83440da336a0de1e40 (patch)
treeff8729c5be0ce419330d8b3dde03cfb327b0b7a5 /libavcodec
parent5f30522894d19a14324b80bc282c094dabdb31c0 (diff)
parentee37620b6ae4783cda637408422044b2d14a688c (diff)
downloadffmpeg-b78074fd13ad340b8ea4bb83440da336a0de1e40.tar.gz
Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'
* commit 'ee37620b6ae4783cda637408422044b2d14a688c': movenc: Add a flag for indicating a discontinuous fragment Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions