Remove -fasm CFLAGS check, it is no longer needed.

[ffmpeg] / libavcodec / vcr1.c

diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 73da86d3a488adc9be7aa342e5a68d4b7120d4b7..d9d4ce9f615ae7e9c43405c9d7218cc5007bf20d 100644 (file)
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -30,6 +30,9 @@
 //#undef NDEBUG
 //#include <assert.h>
 
+/* Disable the encoder. */
+#undef CONFIG_VCR1_ENCODER
+
 typedef struct VCR1Context{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -113,7 +116,7 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#if 0
+#ifdef CONFIG_VCR1_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     VCR1Context * const a = avctx->priv_data;
     AVFrame *pict = data;
@@ -153,7 +156,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
+#ifdef CONFIG_VCR1_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
@@ -174,9 +177,8 @@ AVCodec vcr1_decoder = {
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-#if 0
-#ifdef CONFIG_ENCODERS
 
+#ifdef CONFIG_VCR1_ENCODER
 AVCodec vcr1_encoder = {
     "vcr1",
     CODEC_TYPE_VIDEO,
@@ -187,6 +189,4 @@ AVCodec vcr1_encoder = {
     //encode_end,
     .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-
-#endif //CONFIG_ENCODERS
 #endif