diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 14:09:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 14:09:53 +0100 |
| commit | 94fe404c25f982f0fd28e9d63f0a7c7a29514bf6 (patch) | |
| tree | e49680189b615da590d881254fc3779c1f3b9a2b /libavformat | |
| parent | cfef947f7f1f2520098e4e2763cf5ec2f7cc21c7 (diff) | |
| parent | e839de0f851535b5e19256b52f9865f0cb768a7c (diff) | |
| download | ffmpeg-94fe404c25f982f0fd28e9d63f0a7c7a29514bf6.tar.gz | |
Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'
* commit 'e839de0f851535b5e19256b52f9865f0cb768a7c':
oggenc: accept only STREAMINFO extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oggenc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index fbbe320b21..dda229e04f 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -307,12 +307,10 @@ static int ogg_build_flac_headers(AVCodecContext *avctx, OGGStreamContext *oggstream, int bitexact, AVDictionary **m) { - enum FLACExtradataFormat format; - uint8_t *streaminfo; uint8_t *p; - if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo)) - return -1; + if (avctx->extradata_size < FLAC_STREAMINFO_SIZE) + return AVERROR(EINVAL); // first packet: STREAMINFO 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_byte(&p, 0x00); // streaminfo 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 p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m, 0); |