Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
90e8a9c3
Commit
90e8a9c3
authored
Feb 03, 2011
by
Kostya
Committed by
Ronald S. Bultje
Feb 07, 2011
Browse files
Remove Xan WC4 cruft from xan.c
Signed-off-by:
Ronald S. Bultje
<
rsbultje@gmail.com
>
parent
44ddfd47
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
30 deletions
+2
-30
libavcodec/xan.c
libavcodec/xan.c
+2
-30
No files found.
libavcodec/xan.c
View file @
90e8a9c3
...
...
@@ -358,9 +358,6 @@ static void xan_wc3_decode_frame(XanContext *s) {
}
}
static
void
xan_wc4_decode_frame
(
XanContext
*
s
)
{
}
#if RUNTIME_GAMMA
static
inline
unsigned
mul
(
unsigned
a
,
unsigned
b
)
{
...
...
@@ -515,23 +512,12 @@ static int xan_decode_frame(AVCodecContext *avctx,
if
(
!
s
->
frame_size
)
s
->
frame_size
=
s
->
current_frame
.
linesize
[
0
]
*
s
->
avctx
->
height
;
if
(
avctx
->
codec
->
id
==
CODEC_ID_XAN_WC3
)
{
memcpy
(
s
->
current_frame
.
data
[
1
],
s
->
palettes
+
s
->
cur_palette
*
AVPALETTE_COUNT
,
AVPALETTE_SIZE
);
}
else
{
AVPaletteControl
*
palette_control
=
avctx
->
palctrl
;
palette_control
->
palette_changed
=
0
;
memcpy
(
s
->
current_frame
.
data
[
1
],
palette_control
->
palette
,
AVPALETTE_SIZE
);
s
->
current_frame
.
palette_has_changed
=
1
;
}
s
->
buf
=
buf
;
s
->
size
=
buf_size
;
if
(
avctx
->
codec
->
id
==
CODEC_ID_XAN_WC3
)
xan_wc3_decode_frame
(
s
);
else
if
(
avctx
->
codec
->
id
==
CODEC_ID_XAN_WC4
)
xan_wc4_decode_frame
(
s
);
/* release the last frame if it is allocated */
if
(
s
->
last_frame
.
data
[
0
])
...
...
@@ -577,17 +563,3 @@ AVCodec ff_xan_wc3_decoder = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Wing Commander III / Xan"
),
};
/*
AVCodec ff_xan_wc4_decoder = {
"xan_wc4",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_XAN_WC4,
sizeof(XanContext),
xan_decode_init,
NULL,
xan_decode_end,
xan_decode_frame,
CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"),
};
*/
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