[FFmpeg-cvslog] Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 14 12:11:40 2013 +0200| [070c22d53a2bbd35e332770056b3d2e44a573bf3] | committer: Michael Niedermayer

Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'

* commit '3562684db716d11de0b0dcc52748e9cd90d68132':
  ogg: Always alloc the private context in vorbis_header

Conflicts:
	libavformat/oggparsevorbis.c

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

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