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
681e72a6
Commit
681e72a6
authored
Feb 27, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mjpegdec: parse adobe_transform
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7e8be708
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
mjpegdec.c
libavcodec/mjpegdec.c
+3
-3
mjpegdec.h
libavcodec/mjpegdec.h
+1
-0
No files found.
libavcodec/mjpegdec.c
View file @
681e72a6
...
...
@@ -1515,12 +1515,12 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
}
if
(
id
==
AV_RB32
(
"Adob"
)
&&
(
get_bits
(
&
s
->
gb
,
8
)
==
'e'
))
{
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
)
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mjpeg: Adobe header found
\n
"
);
skip_bits
(
&
s
->
gb
,
16
);
/* version */
skip_bits
(
&
s
->
gb
,
16
);
/* flags0 */
skip_bits
(
&
s
->
gb
,
16
);
/* flags1 */
skip_bits
(
&
s
->
gb
,
8
);
/* transform */
s
->
adobe_transform
=
get_bits
(
&
s
->
gb
,
8
);
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
)
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mjpeg: Adobe header found, transform=%d
\n
"
,
s
->
adobe_transform
);
len
-=
7
;
goto
out
;
}
...
...
libavcodec/mjpegdec.h
View file @
681e72a6
...
...
@@ -69,6 +69,7 @@ typedef struct MJpegDecodeContext {
int
bits
;
/* bits per component */
int
colr
;
int
xfrm
;
int
adobe_transform
;
int
maxval
;
int
near
;
///< near lossless bound (si 0 for lossless)
...
...
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