Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c1c2b0b3
Commit
c1c2b0b3
authored
Apr 22, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: rename jpeg2000 decoder to j2k
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7a556ebc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
Makefile
libavcodec/Makefile
+2
-2
allcodecs.c
libavcodec/allcodecs.c
+1
-1
j2kdec.c
libavcodec/j2kdec.c
+1
-1
j2kenc.c
libavcodec/j2kenc.c
+1
-1
vcodec.mak
tests/fate/vcodec.mak
+1
-1
No files found.
libavcodec/Makefile
View file @
c1c2b0b3
...
@@ -242,8 +242,8 @@ OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi_common.o ivi_dsp.o
...
@@ -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_J
PEG2000_DECODER)
+=
j2kdec.o
mqcdec.o
mqc.o
j2k.o
j2k_dwt.o
OBJS-$(CONFIG_J
2K_DECODER)
+=
j2kdec.o
mqcdec.o
mqc.o
j2k.o
j2k_dwt.o
OBJS-$(CONFIG_J
PEG2000_ENCODER)
+=
j2kenc.o
mqcenc.o
mqc.o
j2k.o
j2k_dwt.o
OBJS-$(CONFIG_J
2K_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
...
...
libavcodec/allcodecs.c
View file @
c1c2b0b3
...
@@ -171,7 +171,7 @@ void avcodec_register_all(void)
...
@@ -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
(
J
PEG2000
,
jpeg2000
);
REGISTER_ENCDEC
(
J
2K
,
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
);
...
...
libavcodec/j2kdec.c
View file @
c1c2b0b3
...
@@ -1081,7 +1081,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx)
...
@@ -1081,7 +1081,7 @@ static av_cold int j2kdec_init(AVCodecContext *avctx)
return
0
;
return
0
;
}
}
AVCodec
ff_j
peg2000
_decoder
=
{
AVCodec
ff_j
2k
_decoder
=
{
.
name
=
"j2k"
,
.
name
=
"j2k"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_JPEG2000
,
.
id
=
AV_CODEC_ID_JPEG2000
,
...
...
libavcodec/j2kenc.c
View file @
c1c2b0b3
...
@@ -1026,7 +1026,7 @@ static int j2kenc_destroy(AVCodecContext *avctx)
...
@@ -1026,7 +1026,7 @@ static int j2kenc_destroy(AVCodecContext *avctx)
return
0
;
return
0
;
}
}
AVCodec
ff_j
peg2000
_encoder
=
{
AVCodec
ff_j
2k
_encoder
=
{
.
name
=
"j2k"
,
.
name
=
"j2k"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_JPEG2000
,
.
id
=
AV_CODEC_ID_JPEG2000
,
...
...
tests/fate/vcodec.mak
View file @
c1c2b0b3
...
@@ -89,7 +89,7 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls
...
@@ -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, J
PEG2000
, AVI) += j2k
FATE_VCODEC-$(call ENCDEC, J
2K
, 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment