Michael Niedermayer 070c22d53a Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132' ...

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

Conflicts:
	libavformat/oggparsevorbis.c

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

2013-08-14 12:17:02 +02:00

13 KiB

Raw Blame History

View Raw