generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avconv: rename transcode_audio/video to decode_audio/video.

Browse Source 
Those functions do only decoding now, encoding is run from
poll_filters().
This commit is contained in:
Anton Khirnov 2012-05-18 12:46:11 +02:00
parent f297dd3812
commit 0629f6128e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
avconv.c
View File

@ -2120,7 +2120,7 @@ static int guess_input_channel_layout(InputStream *ist)
return 1; 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; AVFrame *decoded_frame;
AVCodecContext *avctx = ist->st->codec; AVCodecContext *avctx = ist->st->codec;
@ -2262,7 +2262,7 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
return ret; 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; AVFrame *decoded_frame;
void *buffer_to_free = NULL; void *buffer_to_free = NULL;
@ -2410,10 +2410,10 @@ static int output_packet(InputStream *ist, const AVPacket *pkt)
switch (ist->st->codec->codec_type) { switch (ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
ret = transcode_audio (ist, &avpkt, &got_output); ret = decode_audio (ist, &avpkt, &got_output);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ret = transcode_video (ist, &avpkt, &got_output); ret = decode_video (ist, &avpkt, &got_output);
if (avpkt.duration) if (avpkt.duration)
ist->next_dts += av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q); ist->next_dts += av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q);
else if (ist->st->r_frame_rate.num) else if (ist->st->r_frame_rate.num)