Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jun 2014 10:54:15 +0000 (12:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jun 2014 10:54:15 +0000 (12:54 +0200)
commitc7e54628e30acbe896f92c8b8d89ae63901834ff
tree67307ec7145d058d3267cbb47e4eccb6b23b6ba9
parenta40c338a00a4e1c7f2cce189db0f406f85d5792a
parent95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7
Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'

* commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7':
  oggenc: Support flushing the muxer

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggenc.c
libavformat/version.h