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
3250d4b3
Commit
3250d4b3
authored
Feb 28, 2017
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/oggdec: remove unused parameter of ogg_restore()
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
70ebc05b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
oggdec.c
libavformat/oggdec.c
+5
-8
No files found.
libavformat/oggdec.c
View file @
3250d4b3
...
...
@@ -61,7 +61,7 @@ static const struct ogg_codec * const ogg_codecs[] = {
static
int64_t
ogg_calc_pts
(
AVFormatContext
*
s
,
int
idx
,
int64_t
*
dts
);
static
int
ogg_new_stream
(
AVFormatContext
*
s
,
uint32_t
serial
);
static
int
ogg_restore
(
AVFormatContext
*
s
,
int
discard
);
static
int
ogg_restore
(
AVFormatContext
*
s
);
//FIXME We could avoid some structure duplication
static
int
ogg_save
(
AVFormatContext
*
s
)
...
...
@@ -95,12 +95,12 @@ static int ogg_save(AVFormatContext *s)
ogg
->
state
=
ost
;
if
(
ret
<
0
)
ogg_restore
(
s
,
0
);
ogg_restore
(
s
);
return
ret
;
}
static
int
ogg_restore
(
AVFormatContext
*
s
,
int
discard
)
static
int
ogg_restore
(
AVFormatContext
*
s
)
{
struct
ogg
*
ogg
=
s
->
priv_data
;
AVIOContext
*
bc
=
s
->
pb
;
...
...
@@ -112,8 +112,6 @@ static int ogg_restore(AVFormatContext *s, int discard)
ogg
->
state
=
ost
->
next
;
if
(
!
discard
)
{
for
(
i
=
0
;
i
<
ogg
->
nstreams
;
i
++
)
av_freep
(
&
ogg
->
streams
[
i
].
buf
);
...
...
@@ -128,7 +126,6 @@ static int ogg_restore(AVFormatContext *s, int discard)
}
else
memcpy
(
ogg
->
streams
,
ost
->
streams
,
ost
->
nstreams
*
sizeof
(
*
ogg
->
streams
));
}
av_free
(
ost
);
...
...
@@ -631,7 +628,7 @@ static int ogg_get_length(AVFormatContext *s)
}
}
ogg_restore
(
s
,
0
);
ogg_restore
(
s
);
ret
=
ogg_save
(
s
);
if
(
ret
<
0
)
...
...
@@ -654,7 +651,7 @@ static int ogg_get_length(AVFormatContext *s)
streams_left
--
;
}
}
ogg_restore
(
s
,
0
);
ogg_restore
(
s
);
return
0
;
}
...
...
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