Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
0fb669ae
Commit
0fb669ae
authored
15 years ago
by
Kostya Shishkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics: reindent
Originally committed as revision 20919 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
43a6ca2c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
interplayvideo.c
libavcodec/interplayvideo.c
+8
-8
No files found.
libavcodec/interplayvideo.c
View file @
0fb669ae
...
@@ -77,11 +77,11 @@ typedef struct IpvideoContext {
...
@@ -77,11 +77,11 @@ typedef struct IpvideoContext {
}
IpvideoContext
;
}
IpvideoContext
;
#define CHECK_STREAM_PTR(n) \
#define CHECK_STREAM_PTR(n) \
if (s->stream_end - s->stream_ptr < n) { \
if (s->stream_end - s->stream_ptr < n) { \
av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
s->stream_ptr + n, s->stream_end); \
s->stream_ptr + n, s->stream_end); \
return -1; \
return -1; \
}
}
static
int
copy_from
(
IpvideoContext
*
s
,
AVFrame
*
src
,
int
delta_x
,
int
delta_y
)
static
int
copy_from
(
IpvideoContext
*
s
,
AVFrame
*
src
,
int
delta_x
,
int
delta_y
)
{
{
...
@@ -591,20 +591,20 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
...
@@ -591,20 +591,20 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
opcode
=
get_bits
(
&
gb
,
4
);
opcode
=
get_bits
(
&
gb
,
4
);
debug_interplay
(
" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p
\n
"
,
debug_interplay
(
" block @ (%3d, %3d): encoding 0x%X, data ptr @ %p
\n
"
,
x
-
y
,
y
/
s
->
stride
,
opcode
,
s
->
stream_ptr
);
x
-
y
,
y
/
s
->
stride
,
opcode
,
s
->
stream_ptr
);
s
->
pixel_ptr
=
s
->
current_frame
.
data
[
0
]
+
x
;
s
->
pixel_ptr
=
s
->
current_frame
.
data
[
0
]
+
x
;
ret
=
ipvideo_decode_block
[
opcode
](
s
);
ret
=
ipvideo_decode_block
[
opcode
](
s
);
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
" Interplay video: decode problem on frame %d, @ block (%d, %d)
\n
"
,
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
" Interplay video: decode problem on frame %d, @ block (%d, %d)
\n
"
,
frame
,
x
-
y
,
y
/
s
->
stride
);
frame
,
x
-
y
,
y
/
s
->
stride
);
return
;
return
;
}
}
}
}
}
}
if
(
s
->
stream_end
-
s
->
stream_ptr
>
1
)
{
if
(
s
->
stream_end
-
s
->
stream_ptr
>
1
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
" Interplay video: decode finished with %td bytes left over
\n
"
,
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
" Interplay video: decode finished with %td bytes left over
\n
"
,
s
->
stream_end
-
s
->
stream_ptr
);
s
->
stream_end
-
s
->
stream_ptr
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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