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@gmx.at>

diff --cc libavformat/oggparsevorbis.c
index d071a35,adf8f03..7d525f4
--- 1/libavformat/oggparsevorbis.c
--- 2/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@@ -240,12 -215,12 +240,12 @@@ vorbis_header (AVFormatContext * s, in
      if (!os->private) {
          os->private = av_mallocz(sizeof(struct oggvorbis_private));
          if (!os->private)
 -            return 0;
 +            return -1;
      }
  
+     if (!(pkt_type & 1))
+         return 0;
+ 
      if (os->psize < 1 || pkt_type > 5)
          return -1;