generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-06 14:09:35 +01:00
commit 94fe404c25
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/oggenc.c
View File

@ -307,12 +307,10 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
OGGStreamContext *oggstream, int bitexact, OGGStreamContext *oggstream, int bitexact,
AVDictionary **m) AVDictionary **m)
{ {
enum FLACExtradataFormat format;
uint8_t *streaminfo;
uint8_t *p; uint8_t *p;
if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo)) if (avctx->extradata_size < FLAC_STREAMINFO_SIZE)
return -1; return AVERROR(EINVAL);
// first packet: STREAMINFO // first packet: STREAMINFO
oggstream->header_len[0] = 51; oggstream->header_len[0] = 51;
@ -328,7 +326,7 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
bytestream_put_buffer(&p, "fLaC", 4); bytestream_put_buffer(&p, "fLaC", 4);
bytestream_put_byte(&p, 0x00); // streaminfo bytestream_put_byte(&p, 0x00); // streaminfo
bytestream_put_be24(&p, 34); bytestream_put_be24(&p, 34);
bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE); bytestream_put_buffer(&p, avctx->extradata, FLAC_STREAMINFO_SIZE);
// second packet: VorbisComment // second packet: VorbisComment
p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m, 0); p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m, 0);