diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 19:22:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 19:28:33 +0200 |
| commit | c1c2b0b3390482bba39534f2f125d97e8964d7d5 (patch) | |
| tree | 33e5832199b2d582bd06f2debcf03b26eeff3adf | |
| parent | 7a556ebccfd6baf971d998127f9a1518b42830ae (diff) | |
| download | ffmpeg-c1c2b0b3390482bba39534f2f125d97e8964d7d5.tar.gz | |
avcodec: rename jpeg2000 decoder to j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/j2kdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/j2kenc.c | 2 | ||||
| -rw-r--r-- | tests/fate/vcodec.mak | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ac342b1333..8ffb44eccf 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -242,8 +242,8 @@ OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi_common.o ivi_dsp.o OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.o -OBJS-$(CONFIG_JPEG2000_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o j2k_dwt.o -OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o j2k_dwt.o +OBJS-$(CONFIG_J2K_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o j2k_dwt.o +OBJS-$(CONFIG_J2K_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o j2k_dwt.o OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ mjpegdec.o mjpeg.o OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 19a638ccbb..cb7fc3b7d0 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -171,7 +171,7 @@ void avcodec_register_all(void) REGISTER_DECODER(INDEO4, indeo4); REGISTER_DECODER(INDEO5, indeo5); REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video); - REGISTER_ENCDEC (JPEG2000, jpeg2000); + REGISTER_ENCDEC (J2K, j2k); REGISTER_ENCDEC (JPEGLS, jpegls); REGISTER_DECODER(JV, jv); REGISTER_DECODER(KGV1, kgv1); diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 6dcaf73839..683062d76b 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -1081,7 +1081,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx) return 0; } -AVCodec ff_jpeg2000_decoder = { +AVCodec ff_j2k_decoder = { .name = "j2k", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 5d447eded9..ffbd5036f8 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1026,7 +1026,7 @@ static int j2kenc_destroy(AVCodecContext *avctx) return 0; } -AVCodec ff_jpeg2000_encoder = { +AVCodec ff_j2k_encoder = { .name = "j2k", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 5ddee19fe0..cc2ad28ba0 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -89,7 +89,7 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: DECOPTS = -sws_flags area -FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += j2k +FATE_VCODEC-$(call ENCDEC, J2K, AVI) += j2k fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental |