summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-03-22 10:26:43 +0100
committerAnton Khirnov <anton@khirnov.net>2012-04-06 20:21:07 +0200
commitd4936548f4808d30f9771862af07f29321db243d (patch)
tree2dc19d5dd0a02915b529533fd3df4084fb621373
parent4648fe632464830c62b40e68a0fce8e7723d6939 (diff)
downloadffmpeg-streaming-d4936548f4808d30f9771862af07f29321db243d.zip
ffmpeg-streaming-d4936548f4808d30f9771862af07f29321db243d.tar.gz
avconv: remove an unused function parameter.
-rw-r--r--avconv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index f2d1ea1..95dc8d8 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1307,7 +1307,6 @@ static void do_subtitle_out(AVFormatContext *s,
static void do_video_out(AVFormatContext *s,
OutputStream *ost,
- InputStream *ist,
AVFrame *in_picture,
int *frame_size, float quality)
{
@@ -1980,7 +1979,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
if (!ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
- do_video_out(output_files[ost->file_index].ctx, ost, ist, filtered_frame, &frame_size,
+ do_video_out(output_files[ost->file_index].ctx, ost, filtered_frame, &frame_size,
same_quant ? quality : ost->st->codec->global_quality);
if (vstats_filename && frame_size)
do_video_stats(output_files[ost->file_index].ctx, ost, frame_size);
OpenPOWER on IntegriCloud