Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 13:09:35 +0000 (14:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 13:09:53 +0000 (14:09 +0100)
commit94fe404c25f982f0fd28e9d63f0a7c7a29514bf6
treee49680189b615da590d881254fc3779c1f3b9a2b
parentcfef947f7f1f2520098e4e2763cf5ec2f7cc21c7
parente839de0f851535b5e19256b52f9865f0cb768a7c
Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'

* commit 'e839de0f851535b5e19256b52f9865f0cb768a7c':
  oggenc: accept only STREAMINFO extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggenc.c