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
03a6ed83
Commit
03a6ed83
authored
Mar 14, 2016
by
Matthieu Bouron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/mediacodec: remove stray empty lines
parent
31fe3c4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
mediacodec_wrapper.c
libavcodec/mediacodec_wrapper.c
+0
-7
mediacodecdec.c
libavcodec/mediacodecdec.c
+0
-1
No files found.
libavcodec/mediacodec_wrapper.c
View file @
03a6ed83
...
...
@@ -398,7 +398,6 @@ fail:
return
NULL
;
}
int
ff_AMediaFormat_delete
(
FFAMediaFormat
*
format
)
{
int
ret
=
0
;
...
...
@@ -658,7 +657,6 @@ fail:
return
ret
;
}
void
ff_AMediaFormat_setInt32
(
FFAMediaFormat
*
format
,
const
char
*
name
,
int32_t
value
)
{
int
attached
=
0
;
...
...
@@ -913,7 +911,6 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
{
"android/media/MediaCodec"
,
"getInputBuffer"
,
"(I)Ljava/nio/ByteBuffer;"
,
FF_JNI_METHOD
,
offsetof
(
struct
JNIAMediaCodecFields
,
get_input_buffer_id
),
0
},
{
"android/media/MediaCodec"
,
"getInputBuffers"
,
"()[Ljava/nio/ByteBuffer;"
,
FF_JNI_METHOD
,
offsetof
(
struct
JNIAMediaCodecFields
,
get_input_buffers_id
),
1
},
{
"android/media/MediaCodec"
,
"dequeueOutputBuffer"
,
"(Landroid/media/MediaCodec$BufferInfo;J)I"
,
FF_JNI_METHOD
,
offsetof
(
struct
JNIAMediaCodecFields
,
dequeue_output_buffer_id
),
1
},
{
"android/media/MediaCodec"
,
"getOutputBuffer"
,
"(I)Ljava/nio/ByteBuffer;"
,
FF_JNI_METHOD
,
offsetof
(
struct
JNIAMediaCodecFields
,
get_output_buffer_id
),
0
},
{
"android/media/MediaCodec"
,
"getOutputBuffers"
,
"()[Ljava/nio/ByteBuffer;"
,
FF_JNI_METHOD
,
offsetof
(
struct
JNIAMediaCodecFields
,
get_output_buffers_id
),
1
},
...
...
@@ -931,7 +928,6 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
{
NULL
}
};
static
const
AVClass
amediacodec_class
=
{
.
class_name
=
"amediacodec"
,
.
item_name
=
av_default_item_name
,
...
...
@@ -1252,7 +1248,6 @@ fail:
return
NULL
;
}
int
ff_AMediaCodec_delete
(
FFAMediaCodec
*
codec
)
{
int
ret
=
0
;
...
...
@@ -1388,7 +1383,6 @@ fail:
return
ret
;
}
int
ff_AMediaCodec_releaseOutputBuffer
(
FFAMediaCodec
*
codec
,
size_t
idx
,
int
render
)
{
int
ret
=
0
;
...
...
@@ -1429,7 +1423,6 @@ fail:
return
ret
;
}
ssize_t
ff_AMediaCodec_dequeueInputBuffer
(
FFAMediaCodec
*
codec
,
int64_t
timeoutUs
)
{
int
ret
=
0
;
...
...
libavcodec/mediacodecdec.c
View file @
03a6ed83
...
...
@@ -389,7 +389,6 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
int64_t
input_dequeue_timeout_us
=
INPUT_DEQUEUE_TIMEOUT_US
;
int64_t
output_dequeue_timeout_us
=
OUTPUT_DEQUEUE_TIMEOUT_US
;
if
(
pkt
->
size
==
0
)
{
need_flushing
=
1
;
}
...
...
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