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
96d8b5a6
Commit
96d8b5a6
authored
Mar 28, 2004
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hmm av_log(..., get_bits());
Originally committed as revision 2939 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
906b578f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
5 deletions
+12
-5
mjpeg.c
libavcodec/mjpeg.c
+12
-5
No files found.
libavcodec/mjpeg.c
View file @
96d8b5a6
...
@@ -1530,16 +1530,22 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
...
@@ -1530,16 +1530,22 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
if
(
id
==
ff_get_fourcc
(
"JFIF"
))
if
(
id
==
ff_get_fourcc
(
"JFIF"
))
{
{
int
t_w
,
t_h
;
int
t_w
,
t_h
,
v1
,
v2
;
skip_bits
(
&
s
->
gb
,
8
);
/* the trailing zero-byte */
skip_bits
(
&
s
->
gb
,
8
);
/* the trailing zero-byte */
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
)
v1
=
get_bits
(
&
s
->
gb
,
8
);
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mjpeg: JFIF header found (version: %x.%x)
\n
"
,
v2
=
get_bits
(
&
s
->
gb
,
8
);
get_bits
(
&
s
->
gb
,
8
),
get_bits
(
&
s
->
gb
,
8
));
skip_bits
(
&
s
->
gb
,
8
);
skip_bits
(
&
s
->
gb
,
8
);
s
->
avctx
->
sample_aspect_ratio
.
num
=
get_bits
(
&
s
->
gb
,
16
);
s
->
avctx
->
sample_aspect_ratio
.
num
=
get_bits
(
&
s
->
gb
,
16
);
s
->
avctx
->
sample_aspect_ratio
.
den
=
get_bits
(
&
s
->
gb
,
16
);
s
->
avctx
->
sample_aspect_ratio
.
den
=
get_bits
(
&
s
->
gb
,
16
);
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
)
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mjpeg: JFIF header found (version: %x.%x) SAR=%d/%d
\n
"
,
v1
,
v2
,
s
->
avctx
->
sample_aspect_ratio
.
num
,
s
->
avctx
->
sample_aspect_ratio
.
den
);
t_w
=
get_bits
(
&
s
->
gb
,
8
);
t_w
=
get_bits
(
&
s
->
gb
,
8
);
t_h
=
get_bits
(
&
s
->
gb
,
8
);
t_h
=
get_bits
(
&
s
->
gb
,
8
);
if
(
t_w
&&
t_h
)
if
(
t_w
&&
t_h
)
...
@@ -1636,6 +1642,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
...
@@ -1636,6 +1642,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
else
else
cbuf
[
i
]
=
0
;
cbuf
[
i
]
=
0
;
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
)
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mjpeg comment: '%s'
\n
"
,
cbuf
);
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"mjpeg comment: '%s'
\n
"
,
cbuf
);
/* buggy avid, it puts EOI only at every 10th frame */
/* buggy avid, it puts EOI only at every 10th frame */
...
...
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