aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/flacenc_header.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-11 00:40:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-11 01:05:33 +0100
commit964912aba56a29acf25c9e216255ea44190f419a (patch)
treefa82f5555f1604d36380b186f1f89403d0b9c388 /libavformat/flacenc_header.c
parentcdba9b617f1a77f035416096f3ea91158ec5307b (diff)
parent2e87b4c51152e0241cae7f655d53920029a0e632 (diff)
downloadffmpeg-964912aba56a29acf25c9e216255ea44190f419a.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits) Warn about avserver being broken. avconv: drop code for special handling of avserver streams. rawdec: don't set codec timebase. lavf doxy: add muxing stuff to lavf_encoding group lavf doxy: add demuxing stuff to lavf_decoding group lavf doxy: expand/reword metadata API doxy. lavf doxy: add installed headers to groups. lavf doxy: add avio groups into the lavf_io group. lavf doxy: rename lavf I/O group to lavf_io. lavf doxy: add metadata docs to the main lavf group ttadec: check channel count as read from extradata. Add CLJR encoding and decoding regression tests cljr: remove unused code flacdec: Support for tracks in cuesheet metadata block ptx: fix inverted check for sufficient data flac muxer: fix writing of file header and STREAMINFO header from extradata ptx: emit a warning on insufficient picture data utvideo: add fate tests covering all codec variants doc: update to refer to avconv doc: remove some stale entries from the faq ... Conflicts: Changelog avconv.c doc/avconv.texi doc/faq.texi doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/avcodec.h libavcodec/cljr.c libavformat/avformat.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flacenc_header.c')
-rw-r--r--libavformat/flacenc_header.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libavformat/flacenc_header.c b/libavformat/flacenc_header.c
index cfbdc890af..e16c14bf53 100644
--- a/libavformat/flacenc_header.c
+++ b/libavformat/flacenc_header.c
@@ -37,13 +37,11 @@ int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec,
if (!avpriv_flac_is_extradata_valid(codec, &format, &streaminfo))
return -1;
- /* write "fLaC" stream marker and first metadata block header if needed */
- if (format == FLAC_EXTRADATA_FORMAT_STREAMINFO) {
- avio_write(pb, header, 8);
- }
+ /* write "fLaC" stream marker and first metadata block header */
+ avio_write(pb, header, 8);
- /* write STREAMINFO or full header */
- avio_write(pb, codec->extradata, codec->extradata_size);
+ /* write STREAMINFO */
+ avio_write(pb, streaminfo, FLAC_STREAMINFO_SIZE);
return 0;
}