From 98d06b046dfec1a61cfd04906aff213b6fcce7e4 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 17 Feb 2013 19:56:09 +0100 Subject: [PATCH] Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size" This reverts commit 620b88a302d522f71a6a95aff500cf7bd8520043. Fixes ticket #2272. Conflicts: libavformat/swfenc.c (cherry picked from commit 8d0757e1079f588ed69f629e2d1a4d5f232dc298) --- libavformat/swfenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 4a5be12783..86618d3968 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -188,6 +188,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 == AV_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) @@ -449,7 +453,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)