Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:11:40 +0000 (12:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:17:02 +0000 (12:17 +0200)
commit070c22d53a2bbd35e332770056b3d2e44a573bf3
tree2fdcb1d4e7f48a9441d5bbfd3b045193a6675da9
parent2bac839bd3c3d0865199f4e7cc478afdb10b66c6
parent3562684db716d11de0b0dcc52748e9cd90d68132
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>
libavformat/oggparsevorbis.c