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

Move ff_flac_write_header() to flacenc.h, which removes the Matroska muxer's

Browse Source 
dependency on flacenc.o and fixes the unnecessary dependency on vorbiscomment.o.

Originally committed as revision 22639 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-03-22 21:58:38 +00:00
parent ef768b0c32
commit 19de452a63
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -103,7 +103,7 @@ OBJS-$(CONFIG_M4V_MUXER) += raw.o
OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
riff.o isom.o rmdec.o rm.o riff.o isom.o rmdec.o rm.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
riff.o isom.o avc.o flacenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
OBJS-$(CONFIG_MJPEG_MUXER) += raw.o OBJS-$(CONFIG_MJPEG_MUXER) += raw.o
OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o

23
libavformat/flacenc.c
View File

@ -26,29 +26,6 @@
#include "vorbiscomment.h" #include "vorbiscomment.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec,
int last_block)
{
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 (!ff_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) {
put_buffer(pb, header, 8);
}
/* write STREAMINFO or full header */
put_buffer(pb, codec->extradata, codec->extradata_size);
return 0;
}
static int flac_write_block_padding(ByteIOContext *pb, unsigned int n_padding_bytes, static int flac_write_block_padding(ByteIOContext *pb, unsigned int n_padding_bytes,
int last_block) int last_block)

27
libavformat/flacenc.h
View File

@ -22,9 +22,32 @@
#ifndef AVFORMAT_FLACENC_H #ifndef AVFORMAT_FLACENC_H
#define AVFORMAT_FLACENC_H #define AVFORMAT_FLACENC_H
#include "libavcodec/flac.h"
#include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec, static int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec,
int last_block); int last_block)
{
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 (!ff_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) {
put_buffer(pb, header, 8);
}
/* write STREAMINFO or full header */
put_buffer(pb, codec->extradata, codec->extradata_size);
return 0;
}
#endif /* AVFORMAT_FLACENC_H */ #endif /* AVFORMAT_FLACENC_H */