diff options
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 | ||||
| -rw-r--r-- | libavcodec/iff.c | 13 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 | ||||
| -rw-r--r-- | tests/fate/video.mak | 2 |
7 files changed, 3 insertions, 25 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fc0b5843ad..7a576fda15 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -312,7 +312,6 @@ OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o OBJS-$(CONFIG_IDF_DECODER) += bintext.o cga_data.o -OBJS-$(CONFIG_IFF_BYTERUN1_DECODER) += iff.o OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o OBJS-$(CONFIG_IMC_DECODER) += imc.o OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3870cf6f12..c8f7992f7f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -203,7 +203,6 @@ void avcodec_register_all(void) REGISTER_DECODER(HQX, hqx); REGISTER_ENCDEC (HUFFYUV, huffyuv); REGISTER_DECODER(IDCIN, idcin); - REGISTER_DECODER(IFF_BYTERUN1, iff_byterun1); REGISTER_DECODER(IFF_ILBM, iff_ilbm); REGISTER_DECODER(INDEO2, indeo2); REGISTER_DECODER(INDEO3, indeo3); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 22a68fbfd9..9b7ab3c32e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -241,7 +241,7 @@ enum AVCodecID { AV_CODEC_ID_ANM, AV_CODEC_ID_BINKVIDEO, AV_CODEC_ID_IFF_ILBM, - AV_CODEC_ID_IFF_BYTERUN1, +#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM AV_CODEC_ID_KGV1, AV_CODEC_ID_YOP, AV_CODEC_ID_VP8, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index da8d65816e..6076c41bff 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -877,13 +877,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, { - .id = AV_CODEC_ID_IFF_BYTERUN1, - .type = AVMEDIA_TYPE_VIDEO, - .name = "iff_byterun1", - .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), - .props = AV_CODEC_PROP_LOSSY, - }, - { .id = AV_CODEC_ID_KGV1, .type = AVMEDIA_TYPE_VIDEO, .name = "kgv1", diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 9d1f9a77d1..49df17ccf8 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -890,16 +890,3 @@ AVCodec ff_iff_ilbm_decoder = { .capabilities = AV_CODEC_CAP_DR1, }; #endif -#if CONFIG_IFF_BYTERUN1_DECODER -AVCodec ff_iff_byterun1_decoder = { - .name = "iff", - .long_name = NULL_IF_CONFIG_SMALL("IFF"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_IFF_BYTERUN1, - .priv_data_size = sizeof(IffContext), - .init = decode_init, - .close = decode_end, - .decode = decode_frame, - .capabilities = AV_CODEC_CAP_DR1, -}; -#endif diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 7bfd7608c3..175106714d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -409,7 +409,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, break; } - if (s->codec_id == AV_CODEC_ID_IFF_ILBM || s->codec_id == AV_CODEC_ID_IFF_BYTERUN1) { + if (s->codec_id == AV_CODEC_ID_IFF_ILBM) { w_align = FFMAX(w_align, 8); } diff --git a/tests/fate/video.mak b/tests/fate/video.mak index a5754341fb..a0a70792e2 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -198,7 +198,7 @@ fate-hap-chunk: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hapy-12-chunks.mov FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP) fate-hap: $(FATE_HAP) -FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1 +FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci |