RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0097cbea695e534fce39958ccd103af2fbf65831' 

* commit '0097cbea695e534fce39958ccd103af2fbf65831':
  flac muxer: accept only STREAMINFO extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-01 14:02:25 +02:00
parent 05c5dd403d 0097cbea69
commit 855e3b5700
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/flacenc_header.c
View File

@ -22,7 +22,7 @@
#include "libavutil/channel_layout.h"
#include "libavcodec/flac.h"
#include "libavcodec/bytestream.h"
#include "avformat.h"
#include "flacenc.h"
@ -32,18 +32,17 @@ int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec,
uint8_t header[8] = {
0x66, 0x4C, 0x61, 0x43, 0x00, 0x00, 0x00, 0x22
};
uint8_t *streaminfo;
enum FLACExtradataFormat format;
header[4] = last_block ? 0x80 : 0x00;
if (!avpriv_flac_is_extradata_valid(codec, &format, &streaminfo))
return -1;
if (codec->extradata_size < FLAC_STREAMINFO_SIZE)
return AVERROR_INVALIDDATA;
/* write "fLaC" stream marker and first metadata block header */
avio_write(pb, header, 8);
/* write STREAMINFO */
avio_write(pb, streaminfo, FLAC_STREAMINFO_SIZE);
avio_write(pb, codec->extradata, FLAC_STREAMINFO_SIZE);
return 0;
}