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)
* commit 'e839de0f851535b5e19256b52f9865f0cb768a7c':
  oggenc: accept only STREAMINFO extradata

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

Simple merge