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
9786bd4d
Commit
9786bd4d
authored
Apr 24, 2005
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing broken_rv20_1mb_.rm
Originally committed as revision 4155 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
b80875c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
rv10.c
libavcodec/rv10.c
+10
-8
rm.c
libavformat/rm.c
+1
-1
No files found.
libavcodec/rv10.c
View file @
9786bd4d
...
...
@@ -440,21 +440,23 @@ static int rv20_decode_picture_header(MpegEncContext *s)
}
seq
=
get_bits
(
&
s
->
gb
,
14
)
<<
1
;
if
(
v
>
1
||
(
s
->
avctx
->
sub_id
<
0x20201002
&&
v
>
0
)){
f
=
get_bits
(
&
s
->
gb
,
av_log2
(
v
-
1
)
+
1
);
}
if
(
v
)
f
=
get_bits
(
&
s
->
gb
,
av_log2
(
v
));
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
){
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
"F %d/%d
\n
"
,
f
,
v
);
}
}
else
{
seq
=
get_bits
(
&
s
->
gb
,
8
)
*
128
;
}
// if(s->avctx->sub_id <= 0x20201002){ //0x20201002 definitely needs this
mb_pos
=
ff_h263_decode_mba
(
s
);
/* }else{
mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
s->mb_x= mb_pos % s->mb_width;
s->mb_y= mb_pos / s->mb_width;
}
else
{
seq
=
get_bits
(
&
s
->
gb
,
8
)
*
128
;
mb_pos
=
ff_h263_decode_mba
(
s
);
}
}*/
//av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq);
seq
|=
s
->
time
&~
0x7FFF
;
if
(
seq
-
s
->
time
>
0x4000
)
seq
-=
0x8000
;
...
...
libavformat/rm.c
View file @
9786bd4d
...
...
@@ -606,7 +606,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
tag,
tag_size);
#endif
if
(
tag_size
<
10
)
if
(
tag_size
<
10
&&
tag
!=
MKTAG
(
'D'
,
'A'
,
'T'
,
'A'
)
)
goto
fail
;
switch
(
tag
)
{
case
MKTAG
(
'P'
,
'R'
,
'O'
,
'P'
):
...
...
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