virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavf: rename enc variable in utils.c:has_codec_parameters()

Browse Source 
Rename it to "avctx", the old name was confusing as the function is
used also with decoder contexts.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Stefano Sabatini
2011-07-16 23:08:29 +02:00
committed by Anton Khirnov
parent dfc2c4d900
commit 25dfda7f31
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/utils.c
View File

@@ -2044,29 +2044,29 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset)
} }
} }
static int has_codec_parameters(AVCodecContext *enc) static int has_codec_parameters(AVCodecContext *avctx)
{ {
int val; int val;
switch(enc->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
val = enc->sample_rate && enc->channels && enc->sample_fmt != AV_SAMPLE_FMT_NONE; val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE;
if(!enc->frame_size && if (!avctx->frame_size &&
(enc->codec_id == CODEC_ID_VORBIS || (avctx->codec_id == CODEC_ID_VORBIS ||
enc->codec_id == CODEC_ID_AAC || avctx->codec_id == CODEC_ID_AAC ||
enc->codec_id == CODEC_ID_MP1 || avctx->codec_id == CODEC_ID_MP1 ||
enc->codec_id == CODEC_ID_MP2 || avctx->codec_id == CODEC_ID_MP2 ||
enc->codec_id == CODEC_ID_MP3 || avctx->codec_id == CODEC_ID_MP3 ||
enc->codec_id == CODEC_ID_SPEEX)) avctx->codec_id == CODEC_ID_SPEEX))
return 0; return 0;
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
val = enc->width && enc->pix_fmt != PIX_FMT_NONE; val = avctx->width && avctx->pix_fmt != PIX_FMT_NONE;
break; break;
default: default:
val = 1; val = 1;
break; break;
} }
return enc->codec_id != CODEC_ID_NONE && val != 0; return avctx->codec_id != CODEC_ID_NONE && val != 0;
} }
static int has_decode_delay_been_guessed(AVStream *st) static int has_decode_delay_been_guessed(AVStream *st)