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
2cf8355f
Commit
2cf8355f
authored
May 23, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: get rid of useless AVInputStream.nb_streams.
It's a duplicate of AVFormatContext.nb_streams.
parent
07633154
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
ffmpeg.c
ffmpeg.c
+3
-5
No files found.
ffmpeg.c
View file @
2cf8355f
...
...
@@ -329,7 +329,6 @@ typedef struct AVInputFile {
int
eof_reached
;
/* true if eof reached */
int
ist_index
;
/* index of first stream in ist_table */
int
buffer_size
;
/* current total buffer size */
int
nb_streams
;
/* nb streams we are aware of */
}
AVInputFile
;
static
AVInputStream
*
input_streams
=
NULL
;
...
...
@@ -1976,7 +1975,7 @@ static int transcode(AVFormatContext **output_files,
int
si
=
stream_maps
[
i
].
stream_index
;
if
(
fi
<
0
||
fi
>
nb_input_files
-
1
||
si
<
0
||
si
>
input_files
[
fi
].
nb_streams
-
1
)
{
si
<
0
||
si
>
input_files
[
fi
].
ctx
->
nb_streams
-
1
)
{
fprintf
(
stderr
,
"Could not find input stream #%d.%d
\n
"
,
fi
,
si
);
ret
=
AVERROR
(
EINVAL
);
goto
fail
;
...
...
@@ -1984,7 +1983,7 @@ static int transcode(AVFormatContext **output_files,
fi
=
stream_maps
[
i
].
sync_file_index
;
si
=
stream_maps
[
i
].
sync_stream_index
;
if
(
fi
<
0
||
fi
>
nb_input_files
-
1
||
si
<
0
||
si
>
input_files
[
fi
].
nb_streams
-
1
)
{
si
<
0
||
si
>
input_files
[
fi
].
ctx
->
nb_streams
-
1
)
{
fprintf
(
stderr
,
"Could not find sync stream #%d.%d
\n
"
,
fi
,
si
);
ret
=
AVERROR
(
EINVAL
);
goto
fail
;
...
...
@@ -2569,7 +2568,7 @@ static int transcode(AVFormatContext **output_files,
}
/* the following test is needed in case new streams appear
dynamically in stream : we ignore them */
if
(
pkt
.
stream_index
>=
input_files
[
file_index
].
nb_streams
)
if
(
pkt
.
stream_index
>=
input_files
[
file_index
].
ctx
->
nb_streams
)
goto
discard_packet
;
ist_index
=
input_files
[
file_index
].
ist_index
+
pkt
.
stream_index
;
ist
=
&
input_streams
[
ist_index
];
...
...
@@ -3322,7 +3321,6 @@ static void opt_input_file(const char *filename)
input_files
=
grow_array
(
input_files
,
sizeof
(
*
input_files
),
&
nb_input_files
,
nb_input_files
+
1
);
input_files
[
nb_input_files
-
1
].
ctx
=
ic
;
input_files
[
nb_input_files
-
1
].
ist_index
=
nb_input_streams
-
ic
->
nb_streams
;
input_files
[
nb_input_files
-
1
].
nb_streams
=
ic
->
nb_streams
;
video_channel
=
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