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
aa51b049
Commit
aa51b049
authored
Nov 25, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: rename output_packet() to process_input_packet()
It more accurately describes what this function does
parent
159a06df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
avconv.c
avconv.c
+4
-4
No files found.
avconv.c
View file @
aa51b049
...
@@ -1354,7 +1354,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
...
@@ -1354,7 +1354,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
}
}
/* pkt = NULL means EOF (needed to flush decoder buffers) */
/* pkt = NULL means EOF (needed to flush decoder buffers) */
static
int
out
put_packet
(
InputStream
*
ist
,
const
AVPacket
*
pkt
)
static
int
process_in
put_packet
(
InputStream
*
ist
,
const
AVPacket
*
pkt
)
{
{
int
i
;
int
i
;
int
got_output
;
int
got_output
;
...
@@ -2360,7 +2360,7 @@ static int process_input(void)
...
@@ -2360,7 +2360,7 @@ static int process_input(void)
for
(
i
=
0
;
i
<
ifile
->
nb_streams
;
i
++
)
{
for
(
i
=
0
;
i
<
ifile
->
nb_streams
;
i
++
)
{
ist
=
input_streams
[
ifile
->
ist_index
+
i
];
ist
=
input_streams
[
ifile
->
ist_index
+
i
];
if
(
ist
->
decoding_needed
)
if
(
ist
->
decoding_needed
)
out
put_packet
(
ist
,
NULL
);
process_in
put_packet
(
ist
,
NULL
);
/* mark all outputs that don't go through lavfi as finished */
/* mark all outputs that don't go through lavfi as finished */
for
(
j
=
0
;
j
<
nb_output_streams
;
j
++
)
{
for
(
j
=
0
;
j
<
nb_output_streams
;
j
++
)
{
...
@@ -2436,7 +2436,7 @@ static int process_input(void)
...
@@ -2436,7 +2436,7 @@ static int process_input(void)
}
}
}
}
ret
=
out
put_packet
(
ist
,
&
pkt
);
ret
=
process_in
put_packet
(
ist
,
&
pkt
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"Error while decoding stream #%d:%d
\n
"
,
av_log
(
NULL
,
AV_LOG_ERROR
,
"Error while decoding stream #%d:%d
\n
"
,
ist
->
file_index
,
ist
->
st
->
index
);
ist
->
file_index
,
ist
->
st
->
index
);
...
@@ -2509,7 +2509,7 @@ static int transcode(void)
...
@@ -2509,7 +2509,7 @@ static int transcode(void)
for
(
i
=
0
;
i
<
nb_input_streams
;
i
++
)
{
for
(
i
=
0
;
i
<
nb_input_streams
;
i
++
)
{
ist
=
input_streams
[
i
];
ist
=
input_streams
[
i
];
if
(
!
input_files
[
ist
->
file_index
]
->
eof_reached
&&
ist
->
decoding_needed
)
{
if
(
!
input_files
[
ist
->
file_index
]
->
eof_reached
&&
ist
->
decoding_needed
)
{
out
put_packet
(
ist
,
NULL
);
process_in
put_packet
(
ist
,
NULL
);
}
}
}
}
poll_filters
();
poll_filters
();
...
...
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