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
ebfa1264
Commit
ebfa1264
authored
Jan 09, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mjpegdec: allow lowres with amv
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7c3700cd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
mjpegdec.c
libavcodec/mjpegdec.c
+0
-5
sp5xdec.c
libavcodec/sp5xdec.c
+1
-0
No files found.
libavcodec/mjpegdec.c
View file @
ebfa1264
...
...
@@ -1112,11 +1112,6 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
if
(
mb_bitmask
)
init_get_bits
(
&
mb_bitmask_gb
,
mb_bitmask
,
s
->
mb_width
*
s
->
mb_height
);
if
(
s
->
flipped
&&
s
->
avctx
->
lowres
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Can not flip image with lowres
\n
"
);
s
->
flipped
=
0
;
}
s
->
restart_count
=
0
;
for
(
i
=
0
;
i
<
nb_components
;
i
++
)
{
...
...
libavcodec/sp5xdec.c
View file @
ebfa1264
...
...
@@ -117,5 +117,6 @@ AVCodec ff_amv_decoder = {
.
init
=
ff_mjpeg_decode_init
,
.
close
=
ff_mjpeg_decode_end
,
.
decode
=
sp5x_decode_frame
,
.
max_lowres
=
3
,
};
#endif
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