Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
7afa68d3
Commit
7afa68d3
authored
Jul 11, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpegdec: parse app-colr
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
531f0169
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
mjpegdec.c
libavcodec/mjpegdec.c
+7
-0
mjpegdec.h
libavcodec/mjpegdec.h
+1
-0
No files found.
libavcodec/mjpegdec.c
View file @
7afa68d3
...
@@ -1462,6 +1462,13 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
...
@@ -1462,6 +1462,13 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
len
-=
9
;
len
-=
9
;
goto
out
;
goto
out
;
}
}
if
(
id
==
AV_RL32
(
"colr"
)
&&
len
>
0
)
{
s
->
colr
=
get_bits
(
&
s
->
gb
,
8
);
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
)
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"COLR %d
\n
"
,
s
->
colr
);
len
--
;
goto
out
;
}
/* Apple MJPEG-A */
/* Apple MJPEG-A */
if
((
s
->
start_code
==
APP1
)
&&
(
len
>
(
0x28
-
8
)))
{
if
((
s
->
start_code
==
APP1
)
&&
(
len
>
(
0x28
-
8
)))
{
...
...
libavcodec/mjpegdec.h
View file @
7afa68d3
...
@@ -65,6 +65,7 @@ typedef struct MJpegDecodeContext {
...
@@ -65,6 +65,7 @@ typedef struct MJpegDecodeContext {
int
rct
;
/* standard rct */
int
rct
;
/* standard rct */
int
pegasus_rct
;
/* pegasus reversible colorspace transform */
int
pegasus_rct
;
/* pegasus reversible colorspace transform */
int
bits
;
/* bits per component */
int
bits
;
/* bits per component */
int
colr
;
int
maxval
;
int
maxval
;
int
near
;
///< near lossless bound (si 0 for lossless)
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