Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
5d7b2ab6
Commit
5d7b2ab6
authored
Nov 13, 2010
by
Fiona Glaser
Browse files
Fix bugs in qpfile parsing with omitted QPs
parent
1e902646
Changes
1
Hide whitespace changes
Inline
Side-by-side
x264.c
View file @
5d7b2ab6
...
...
@@ -1484,7 +1484,8 @@ static void parse_qpfile( cli_opt_t *opt, x264_picture_t *pic, int i_frame )
while
(
num
<
i_frame
)
{
file_pos
=
ftell
(
opt
->
qpfile
);
ret
=
fscanf
(
opt
->
qpfile
,
"%d %c %d
\n
"
,
&
num
,
&
type
,
&
qp
);
qp
=
-
1
;
ret
=
fscanf
(
opt
->
qpfile
,
"%d %c%*[
\t
]%d
\n
"
,
&
num
,
&
type
,
&
qp
);
pic
->
i_type
=
X264_TYPE_AUTO
;
pic
->
i_qpplus1
=
X264_QP_AUTO
;
if
(
num
>
i_frame
||
ret
==
EOF
)
...
...
@@ -1492,7 +1493,7 @@ static void parse_qpfile( cli_opt_t *opt, x264_picture_t *pic, int i_frame )
fseek
(
opt
->
qpfile
,
file_pos
,
SEEK_SET
);
break
;
}
if
(
num
<
i_frame
&&
ret
=
=
3
)
if
(
num
<
i_frame
&&
ret
>
=
2
)
continue
;
if
(
ret
==
3
&&
qp
>=
0
)
pic
->
i_qpplus1
=
qp
+
1
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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