diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-17 20:55:37 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-17 20:55:37 +0100 |
| commit | 381e3e7e44f9ca9726b5c8ae8ab731daec67e6fd (patch) | |
| tree | 53a8bacafaf3e63ac545fcf5858157ac906512f5 | |
| parent | ec18baadfa17855987144115df4d0324f36ac8ad (diff) | |
| download | ffmpeg-381e3e7e44f9ca9726b5c8ae8ab731daec67e6fd.tar.gz | |
Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size"
This reverts commit 620b88a302d522f71a6a95aff500cf7bd8520043.
Fixes ticket #2272.
| -rw-r--r-- | libavformat/swfenc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 8177ffabf1..b165b4601e 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -187,6 +187,10 @@ static int swf_write_header(AVFormatContext *s) AVCodecContext *enc = s->streams[i]->codec; if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { 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_fifo= av_fifo_alloc(AUDIO_FIFO_SIZE); if (!swf->audio_fifo) @@ -448,7 +452,7 @@ static int swf_write_audio(AVFormatContext *s, } av_fifo_generic_write(swf->audio_fifo, buf, size, NULL); - swf->sound_samples += av_get_audio_frame_duration(enc, size); + swf->sound_samples += enc->frame_size; /* if audio only stream make sure we add swf frames */ if (!swf->video_enc) |