|
|
|
@ -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; |
|
|
|
|
switch(enc->codec_type) { |
|
|
|
|
switch (avctx->codec_type) { |
|
|
|
|
case AVMEDIA_TYPE_AUDIO: |
|
|
|
|
val = enc->sample_rate && enc->channels && enc->sample_fmt != AV_SAMPLE_FMT_NONE; |
|
|
|
|
if(!enc->frame_size && |
|
|
|
|
(enc->codec_id == CODEC_ID_VORBIS || |
|
|
|
|
enc->codec_id == CODEC_ID_AAC || |
|
|
|
|
enc->codec_id == CODEC_ID_MP1 || |
|
|
|
|
enc->codec_id == CODEC_ID_MP2 || |
|
|
|
|
enc->codec_id == CODEC_ID_MP3 || |
|
|
|
|
enc->codec_id == CODEC_ID_SPEEX)) |
|
|
|
|
val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE; |
|
|
|
|
if (!avctx->frame_size && |
|
|
|
|
(avctx->codec_id == CODEC_ID_VORBIS || |
|
|
|
|
avctx->codec_id == CODEC_ID_AAC || |
|
|
|
|
avctx->codec_id == CODEC_ID_MP1 || |
|
|
|
|
avctx->codec_id == CODEC_ID_MP2 || |
|
|
|
|
avctx->codec_id == CODEC_ID_MP3 || |
|
|
|
|
avctx->codec_id == CODEC_ID_SPEEX)) |
|
|
|
|
return 0; |
|
|
|
|
break; |
|
|
|
|
case AVMEDIA_TYPE_VIDEO: |
|
|
|
|
val = enc->width && enc->pix_fmt != PIX_FMT_NONE; |
|
|
|
|
val = avctx->width && avctx->pix_fmt != PIX_FMT_NONE; |
|
|
|
|
break; |
|
|
|
|
default: |
|
|
|
|
val = 1; |
|
|
|
|
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) |
|
|
|
|