summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-05-18 12:46:11 +0200
committerAnton Khirnov <anton@khirnov.net>2012-05-22 21:29:06 +0200
commit0629f6128e1c7507a06377f0dff39dde4ee6c7d5 (patch)
treea0a6420528022f65f5d55a9327e738152d138867
parentf297dd3812510fc83080e265dc4534a3898005b0 (diff)
avconv: rename transcode_audio/video to decode_audio/video.
Those functions do only decoding now, encoding is run from poll_filters().
-rw-r--r--avconv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/avconv.c b/avconv.c
index 8a8ef808ca..5506869d3d 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2120,7 +2120,7 @@ static int guess_input_channel_layout(InputStream *ist)
return 1;
}
-static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
+static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
{
AVFrame *decoded_frame;
AVCodecContext *avctx = ist->st->codec;
@@ -2262,7 +2262,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
return ret;
}
-static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output)
+static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
{
AVFrame *decoded_frame;
void *buffer_to_free = NULL;
@@ -2410,10 +2410,10 @@ static int output_packet(InputStream *ist, const AVPacket *pkt)
switch (ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
- ret = transcode_audio (ist, &avpkt, &got_output);
+ ret = decode_audio (ist, &avpkt, &got_output);
break;
case AVMEDIA_TYPE_VIDEO:
- ret = transcode_video (ist, &avpkt, &got_output);
+ ret = decode_video (ist, &avpkt, &got_output);
if (avpkt.duration)
ist->next_dts += av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
else if (ist->st->r_frame_rate.num)