virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

Disable encoders by undefining CONFIG_FOO_ENCODER once instead of littering

Browse Source 
the code with preprocessor directives.

Originally committed as revision 15176 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-09-03 12:43:18 +00:00
parent 999960c90a
commit c7ac9449ba
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/cljr.c
View File

@ -28,6 +28,9 @@
#include "dsputil.h" #include "dsputil.h"
#include "bitstream.h" #include "bitstream.h"
/* Disable the encoder. */
#undef CONFIG_CLJR_ENCODER
typedef struct CLJRContext{ typedef struct CLJRContext{
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
@ -81,7 +84,6 @@ static int decode_frame(AVCodecContext *avctx,
return buf_size; return buf_size;
} }
#if 0
#ifdef CONFIG_CLJR_ENCODER #ifdef CONFIG_CLJR_ENCODER
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
CLJRContext * const a = avctx->priv_data; CLJRContext * const a = avctx->priv_data;
@ -105,7 +107,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
return size*4; return size*4;
} }
#endif #endif
#endif
static av_cold void common_init(AVCodecContext *avctx){ static av_cold void common_init(AVCodecContext *avctx){
CLJRContext * const a = avctx->priv_data; CLJRContext * const a = avctx->priv_data;
@ -123,7 +124,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
#if 0
#ifdef CONFIG_CLJR_ENCODER #ifdef CONFIG_CLJR_ENCODER
static av_cold int encode_init(AVCodecContext *avctx){ static av_cold int encode_init(AVCodecContext *avctx){
@ -132,7 +132,6 @@ static av_cold int encode_init(AVCodecContext *avctx){
return 0; return 0;
} }
#endif #endif
#endif
AVCodec cljr_decoder = { AVCodec cljr_decoder = {
"cljr", "cljr",
@ -146,7 +145,7 @@ AVCodec cljr_decoder = {
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
}; };
#if 0
#ifdef CONFIG_CLJR_ENCODER #ifdef CONFIG_CLJR_ENCODER
AVCodec cljr_encoder = { AVCodec cljr_encoder = {
"cljr", "cljr",
@ -159,4 +158,3 @@ AVCodec cljr_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
}; };
#endif #endif
#endif

10
libavcodec/vcr1.c
View File

@ -30,6 +30,9 @@
//#undef NDEBUG //#undef NDEBUG
//#include <assert.h> //#include <assert.h>
/* Disable the encoder. */
#undef CONFIG_VCR1_ENCODER
typedef struct VCR1Context{ typedef struct VCR1Context{
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame picture;
@ -113,7 +116,6 @@ static int decode_frame(AVCodecContext *avctx,
return buf_size; return buf_size;
} }
#if 0
#ifdef CONFIG_VCR1_ENCODER #ifdef CONFIG_VCR1_ENCODER
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
VCR1Context * const a = avctx->priv_data; VCR1Context * const a = avctx->priv_data;
@ -137,7 +139,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
return size*4; return size*4;
} }
#endif #endif
#endif
static av_cold void common_init(AVCodecContext *avctx){ static av_cold void common_init(AVCodecContext *avctx){
VCR1Context * const a = avctx->priv_data; VCR1Context * const a = avctx->priv_data;
@ -155,7 +156,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
#if 0
#ifdef CONFIG_VCR1_ENCODER #ifdef CONFIG_VCR1_ENCODER
static av_cold int encode_init(AVCodecContext *avctx){ static av_cold int encode_init(AVCodecContext *avctx){
@ -164,7 +164,6 @@ static av_cold int encode_init(AVCodecContext *avctx){
return 0; return 0;
} }
#endif #endif
#endif
AVCodec vcr1_decoder = { AVCodec vcr1_decoder = {
"vcr1", "vcr1",
@ -178,7 +177,7 @@ AVCodec vcr1_decoder = {
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
}; };
#if 0
#ifdef CONFIG_VCR1_ENCODER #ifdef CONFIG_VCR1_ENCODER
AVCodec vcr1_encoder = { AVCodec vcr1_encoder = {
"vcr1", "vcr1",
@ -191,4 +190,3 @@ AVCodec vcr1_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
}; };
#endif #endif
#endif