aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-04 12:54:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-04 12:54:15 +0200
commitc7e54628e30acbe896f92c8b8d89ae63901834ff (patch)
tree67307ec7145d058d3267cbb47e4eccb6b23b6ba9 /libavutil
parenta40c338a00a4e1c7f2cce189db0f406f85d5792a (diff)
parent95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7 (diff)
downloadffmpeg-c7e54628e30acbe896f92c8b8d89ae63901834ff.tar.gz
Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'
* commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7': oggenc: Support flushing the muxer Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions