virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)

Browse Source 
Originally committed as revision 1843 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-05-07 23:32:45 +00:00
parent 631670888d
commit 5fd74135ad
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/common.c
View File

@ -67,6 +67,8 @@ void init_put_bits(PutBitContext *s,
#endif
}
#ifdef CONFIG_ENCODERS
/* return the number of bits output */
int64_t get_bit_count(PutBitContext *s)
{
@ -86,6 +88,8 @@ void align_put_bits(PutBitContext *s)
#endif
}
#endif //CONFIG_ENCODERS
/* pad the end of the output stream with zeros */
void flush_put_bits(PutBitContext *s)
{
@ -104,6 +108,8 @@ void flush_put_bits(PutBitContext *s)
#endif
}
#ifdef CONFIG_ENCODERS
void put_string(PutBitContext * pbc, char *s)
{
while(*s){
@ -115,6 +121,8 @@ void put_string(PutBitContext * pbc, char *s)
/* bit input functions */
#endif //CONFIG_ENCODERS
void init_get_bits(GetBitContext *s,
const uint8_t *buffer, int bit_size)
{

26
libavcodec/huffyuv.c
View File

@ -170,6 +170,8 @@ static inline void add_median_prediction(uint8_t *dst, uint8_t *src1, uint8_t *d
*left= l;
*left_top= lt;
}
#ifdef CONFIG_ENCODERS
//FIXME optimize
static inline void sub_median_prediction(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w, int *left, int *left_top){
int i;
@ -189,6 +191,7 @@ static inline void sub_median_prediction(uint8_t *dst, uint8_t *src1, uint8_t *s
*left_top= lt;
}
#endif //CONFIG_ENCODERS
static inline void add_left_prediction_bgr32(uint8_t *dst, uint8_t *src, int w, int *red, int *green, int *blue){
int i;
@ -212,6 +215,7 @@ static inline void add_left_prediction_bgr32(uint8_t *dst, uint8_t *src, int w,
*blue= b;
}
#ifdef CONFIG_ENCODERS
static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, uint8_t *src, int w, int left){
int i;
if(w<32){
@ -231,7 +235,7 @@ static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst, uint8_t *src
return src[w-1];
}
}
#endif //CONFIG_ENCODERS
static void read_len_table(uint8_t *dst, GetBitContext *gb){
int i, val, repeat;
@ -266,6 +270,8 @@ static int generate_bits_table(uint32_t *dst, uint8_t *len_table){
return 0;
}
#ifdef CONFIG_ENCODERS
static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){
uint64_t counts[2*size];
int up[2*size];
@ -322,6 +328,8 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){
}
}
#endif //CONFIG_ENCODERS
static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){
GetBitContext gb;
int i;
@ -472,6 +480,8 @@ s->bgr32=1;
return 0;
}
#ifdef CONFIG_ENCODERS
static void store_table(HYuvContext *s, uint8_t *len){
int i;
int index= s->avctx->extradata_size;
@ -593,6 +603,8 @@ static int encode_init(AVCodecContext *avctx)
return 0;
}
#endif //CONFIG_ENCODERS
static void decode_422_bitstream(HYuvContext *s, int count){
int i;
@ -617,6 +629,8 @@ static void decode_gray_bitstream(HYuvContext *s, int count){
}
}
#ifdef CONFIG_ENCODERS
static void encode_422_bitstream(HYuvContext *s, int count){
int i;
@ -655,6 +669,8 @@ static void encode_gray_bitstream(HYuvContext *s, int count){
}
}
#endif //CONFIG_ENCODERS
static void decode_bgr_bitstream(HYuvContext *s, int count){
int i;
@ -965,6 +981,8 @@ static int decode_end(AVCodecContext *avctx)
return 0;
}
#ifdef CONFIG_ENCODERS
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
HYuvContext *s = avctx->priv_data;
AVFrame *pict = data;
@ -1126,6 +1144,8 @@ static int encode_end(AVCodecContext *avctx)
return 0;
}
#endif //CONFIG_ENCODERS
static const AVOption huffyuv_options[] =
{
AVOPTION_CODEC_INT("prediction_method", "prediction_method", prediction_method, 0, 2, 0),
@ -1145,6 +1165,8 @@ AVCodec huffyuv_decoder = {
NULL
};
#ifdef CONFIG_ENCODERS
AVCodec huffyuv_encoder = {
"huffyuv",
CODEC_TYPE_VIDEO,
@ -1155,3 +1177,5 @@ AVCodec huffyuv_encoder = {
encode_end,
.options = huffyuv_options,
};
#endif //CONFIG_ENCODERS

2
libavcodec/i386/dsputil_mmx.c
View File

@ -1559,8 +1559,10 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
const int dct_algo = avctx->dct_algo;
const int idct_algo= avctx->idct_algo;
#ifdef CONFIG_ENCODERS
if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX)
c->fdct = ff_fdct_mmx;
#endif //CONFIG_ENCODERS
if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SIMPLEMMX){
c->idct_put= ff_simple_idct_put_mmx;