|
|
@ -187,10 +187,6 @@ static int swf_write_header(AVFormatContext *s) |
|
|
|
AVCodecContext *enc = s->streams[i]->codec; |
|
|
|
AVCodecContext *enc = s->streams[i]->codec; |
|
|
|
if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { |
|
|
|
if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { |
|
|
|
if (enc->codec_id == CODEC_ID_MP3) { |
|
|
|
if (enc->codec_id == CODEC_ID_MP3) { |
|
|
|
if (!enc->frame_size) { |
|
|
|
|
|
|
|
av_log(s, AV_LOG_ERROR, "audio frame size not set\n"); |
|
|
|
|
|
|
|
return -1; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
swf->audio_enc = enc; |
|
|
|
swf->audio_enc = enc; |
|
|
|
swf->audio_fifo= av_fifo_alloc(AUDIO_FIFO_SIZE); |
|
|
|
swf->audio_fifo= av_fifo_alloc(AUDIO_FIFO_SIZE); |
|
|
|
if (!swf->audio_fifo) |
|
|
|
if (!swf->audio_fifo) |
|
|
@ -452,7 +448,7 @@ static int swf_write_audio(AVFormatContext *s, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
av_fifo_generic_write(swf->audio_fifo, buf, size, NULL); |
|
|
|
av_fifo_generic_write(swf->audio_fifo, buf, size, NULL); |
|
|
|
swf->sound_samples += enc->frame_size; |
|
|
|
swf->sound_samples += av_get_audio_frame_duration(enc, size); |
|
|
|
|
|
|
|
|
|
|
|
/* if audio only stream make sure we add swf frames */ |
|
|
|
/* if audio only stream make sure we add swf frames */ |
|
|
|
if (!swf->video_enc) |
|
|
|
if (!swf->video_enc) |
|
|
|