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
06628137
Commit
06628137
authored
Jan 06, 2016
by
Alexandra Hájková
Committed by
Anton Khirnov
Jan 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asfdec: Remove unused function parameters
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
2aec600a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
asfdec.c
libavformat/asfdec.c
+9
-10
No files found.
libavformat/asfdec.c
View file @
06628137
...
...
@@ -266,7 +266,7 @@ static int asf_read_metadata(AVFormatContext *s, const char *title, uint16_t len
return
0
;
}
static
int
asf_read_value
(
AVFormatContext
*
s
,
const
uint8_t
*
name
,
uint16_t
name_len
,
static
int
asf_read_value
(
AVFormatContext
*
s
,
const
uint8_t
*
name
,
uint16_t
val_len
,
int
type
,
AVDictionary
**
met
)
{
int
ret
;
...
...
@@ -331,7 +331,7 @@ static int asf_read_generic_value(AVIOContext *pb, int type, uint64_t *value)
}
static
int
asf_set_metadata
(
AVFormatContext
*
s
,
const
uint8_t
*
name
,
uint16_t
name_len
,
int
type
,
AVDictionary
**
met
)
int
type
,
AVDictionary
**
met
)
{
AVIOContext
*
pb
=
s
->
pb
;
uint64_t
value
;
...
...
@@ -451,7 +451,7 @@ fail:
return
ret
;
}
static
void
get_id3_tag
(
AVFormatContext
*
s
,
int
len
)
static
void
get_id3_tag
(
AVFormatContext
*
s
)
{
ID3v2ExtraMeta
*
id3v2_extra_meta
=
NULL
;
...
...
@@ -470,21 +470,21 @@ static int process_metadata(AVFormatContext *s, const uint8_t *name, uint16_t na
if
(
val_len
)
{
switch
(
type
)
{
case
ASF_UNICODE
:
asf_read_value
(
s
,
name
,
name_len
,
val_len
,
type
,
met
);
asf_read_value
(
s
,
name
,
val_len
,
type
,
met
);
break
;
case
ASF_BYTE_ARRAY
:
if
(
!
strcmp
(
name
,
"WM/Picture"
))
// handle cover art
asf_read_picture
(
s
,
val_len
);
else
if
(
!
strcmp
(
name
,
"ID3"
))
// handle ID3 tag
get_id3_tag
(
s
,
val_len
);
get_id3_tag
(
s
);
else
asf_read_value
(
s
,
name
,
name_len
,
val_len
,
type
,
met
);
asf_read_value
(
s
,
name
,
val_len
,
type
,
met
);
break
;
case
ASF_GUID
:
ff_get_guid
(
s
->
pb
,
&
guid
);
break
;
default:
if
((
ret
=
asf_set_metadata
(
s
,
name
,
name_len
,
type
,
met
))
<
0
)
if
((
ret
=
asf_set_metadata
(
s
,
name
,
type
,
met
))
<
0
)
return
ret
;
break
;
}
...
...
@@ -1208,8 +1208,7 @@ static int asf_read_multiple_payload(AVFormatContext *s, AVPacket *pkt,
return
0
;
}
static
int
asf_read_single_payload
(
AVFormatContext
*
s
,
AVPacket
*
pkt
,
ASFPacket
*
asf_pkt
)
static
int
asf_read_single_payload
(
AVFormatContext
*
s
,
ASFPacket
*
asf_pkt
)
{
ASFContext
*
asf
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
@@ -1315,7 +1314,7 @@ static int asf_read_payload(AVFormatContext *s, AVPacket *pkt)
if
((
ret
=
asf_read_subpayload
(
s
,
pkt
,
1
))
<
0
)
return
ret
;
}
else
{
if
((
ret
=
asf_read_single_payload
(
s
,
pkt
,
asf_pkt
))
<
0
)
if
((
ret
=
asf_read_single_payload
(
s
,
asf_pkt
))
<
0
)
return
ret
;
}
}
else
{
...
...
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