[FFmpeg-cvslog] Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 00:57:49 2014 +0200| [b5657516b2b2cc302421b58151e0ab968a3cc737] | committer: Michael Niedermayer

Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'

* commit '9767d7c092c890ecc5953452e8a951fd902dd67b':
  oggenc: Flush after writing headers

Conflicts:
	tests/ref/lavf/ogg

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

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