highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec: rename jpeg2000 decoder to j2k

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-22 19:22:09 +02:00
parent 7a556ebccf
commit c1c2b0b339
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/Makefile
View File

@ -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_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.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_J2K_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_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o j2k_dwt.o
OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \
mjpegdec.o mjpeg.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o

2
libavcodec/allcodecs.c
View File

@ -171,7 +171,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(INDEO4, indeo4); REGISTER_DECODER(INDEO4, indeo4);
REGISTER_DECODER(INDEO5, indeo5); REGISTER_DECODER(INDEO5, indeo5);
REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video); REGISTER_DECODER(INTERPLAY_VIDEO, interplay_video);
REGISTER_ENCDEC (JPEG2000, jpeg2000); REGISTER_ENCDEC (J2K, j2k);
REGISTER_ENCDEC (JPEGLS, jpegls); REGISTER_ENCDEC (JPEGLS, jpegls);
REGISTER_DECODER(JV, jv); REGISTER_DECODER(JV, jv);
REGISTER_DECODER(KGV1, kgv1); REGISTER_DECODER(KGV1, kgv1);

2
libavcodec/j2kdec.c
View File

@ -1081,7 +1081,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx)
return 0; return 0;
} }
AVCodec ff_jpeg2000_decoder = { AVCodec ff_j2k_decoder = {
.name = "j2k", .name = "j2k",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000, .id = AV_CODEC_ID_JPEG2000,

2
libavcodec/j2kenc.c
View File

@ -1026,7 +1026,7 @@ static int j2kenc_destroy(AVCodecContext *avctx)
return 0; return 0;
} }
AVCodec ff_jpeg2000_encoder = { AVCodec ff_j2k_encoder = {
.name = "j2k", .name = "j2k",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000, .id = AV_CODEC_ID_JPEG2000,

2
tests/fate/vcodec.mak
View File

@ -89,7 +89,7 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls
fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int
fate-vsynth%-jpegls: DECOPTS = -sws_flags area 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: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental