[FFmpeg-cvslog] Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  4 12:54:15 2014 +0200| [c7e54628e30acbe896f92c8b8d89ae63901834ff] | committer: Michael Niedermayer

Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'

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

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7e54628e30acbe896f92c8b8d89ae63901834ff
---