Commit 620b88a3 authored by Justin Ruggles's avatar Justin Ruggles

swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size

This way we can do stream copy without having the demuxer wait until
frame_size has been set.
parent 14aecc50
...@@ -187,10 +187,6 @@ static int swf_write_header(AVFormatContext *s) ...@@ -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, ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment