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
d16aefee
Commit
d16aefee
authored
Jun 21, 2016
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges
parent
ba5100ce
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
mmaldec.c
libavcodec/mmaldec.c
+14
-14
No files found.
libavcodec/mmaldec.c
View file @
d16aefee
...
...
@@ -357,19 +357,19 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
format_in
=
decoder
->
input
[
0
]
->
format
;
format_in
->
type
=
MMAL_ES_TYPE_VIDEO
;
switch
(
avctx
->
codec_id
)
{
case
AV_CODEC_ID_MPEG2VIDEO
:
format_in
->
encoding
=
MMAL_ENCODING_MP2V
;
break
;
case
AV_CODEC_ID_MPEG4
:
format_in
->
encoding
=
MMAL_ENCODING_MP4V
;
break
;
case
AV_CODEC_ID_VC1
:
format_in
->
encoding
=
MMAL_ENCODING_WVC1
;
break
;
case
AV_CODEC_ID_H264
:
default:
format_in
->
encoding
=
MMAL_ENCODING_H264
;
break
;
case
AV_CODEC_ID_MPEG2VIDEO
:
format_in
->
encoding
=
MMAL_ENCODING_MP2V
;
break
;
case
AV_CODEC_ID_MPEG4
:
format_in
->
encoding
=
MMAL_ENCODING_MP4V
;
break
;
case
AV_CODEC_ID_VC1
:
format_in
->
encoding
=
MMAL_ENCODING_WVC1
;
break
;
case
AV_CODEC_ID_H264
:
default:
format_in
->
encoding
=
MMAL_ENCODING_H264
;
break
;
}
format_in
->
es
->
video
.
width
=
FFALIGN
(
avctx
->
width
,
32
);
format_in
->
es
->
video
.
height
=
FFALIGN
(
avctx
->
height
,
16
);
...
...
@@ -660,7 +660,7 @@ static int ffmmal_read_frame(AVCodecContext *avctx, AVFrame *frame, int *got_fra
// being busy from decoder waiting for input. So just poll at the start and
// keep feeding new data to the buffer.
// We are pretty sure the decoder will produce output if we sent more input
// frames than what a
h
264 decoder could logically delay. This avoids too
// frames than what a
H.
264 decoder could logically delay. This avoids too
// excessive buffering.
// We also wait if we sent eos, but didn't receive it yet (think of decoding
// stream with a very low number of frames).
...
...
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