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
225489f1
Commit
225489f1
authored
Jun 11, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpegdec: remove superfluous "mjpeg "
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
69bf775e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
mjpegdec.c
libavcodec/mjpegdec.c
+5
-5
No files found.
libavcodec/mjpegdec.c
View file @
225489f1
...
...
@@ -103,17 +103,17 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
build_basic_mjpeg_vlc
(
s
);
if
(
s
->
extern_huff
)
{
av_log
(
avctx
,
AV_LOG_INFO
,
"
mjpeg:
using external huffman table
\n
"
);
av_log
(
avctx
,
AV_LOG_INFO
,
"using external huffman table
\n
"
);
init_get_bits
(
&
s
->
gb
,
avctx
->
extradata
,
avctx
->
extradata_size
*
8
);
if
(
ff_mjpeg_decode_dht
(
s
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"
mjpeg:
error using external huffman table, switching back to internal
\n
"
);
"error using external huffman table, switching back to internal
\n
"
);
build_basic_mjpeg_vlc
(
s
);
}
}
if
(
avctx
->
field_order
==
AV_FIELD_BB
)
{
/* quicktime icefloe 019 */
s
->
interlace_polarity
=
1
;
/* bottom field first */
av_log
(
avctx
,
AV_LOG_DEBUG
,
"
mjpeg
bottom field first
\n
"
);
av_log
(
avctx
,
AV_LOG_DEBUG
,
"bottom field first
\n
"
);
}
if
(
avctx
->
codec
->
id
==
CODEC_ID_AMV
)
s
->
flipped
=
1
;
...
...
@@ -1445,7 +1445,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
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
,
"comment: '%s'
\n
"
,
cbuf
);
/* buggy avid, it puts EOI only at every 10th frame */
if
(
!
strcmp
(
cbuf
,
"AVID"
))
{
...
...
@@ -1774,7 +1774,7 @@ the_end:
dst
-=
s
->
linesize
[
s
->
upscale_v
];
}
}
av_log
(
avctx
,
AV_LOG_DEBUG
,
"
mjpeg
decode frame unused %td bytes
\n
"
,
av_log
(
avctx
,
AV_LOG_DEBUG
,
"decode frame unused %td bytes
\n
"
,
buf_end
-
buf_ptr
);
// return buf_end - buf_ptr;
return
buf_ptr
-
buf
;
...
...
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