[FFmpeg-cvslog] swfdec: Simplify sample rate calculation.

Alex Converse git at videolan.org
Thu Feb 2 02:46:23 CET 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Jan 31 09:55:06 2012 -0800| [c0bc7bd1e785c3cfe1ce988b04108694b95b5c9d] | committer: Alex Converse

swfdec: Simplify sample rate calculation.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0bc7bd1e785c3cfe1ce988b04108694b95b5c9d
---

 libavformat/swfdec.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 842cda3..1bcb249 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -137,10 +137,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
             ast->codec->codec_id = ff_codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
             ast->need_parsing = AVSTREAM_PARSE_FULL;
             sample_rate_code= (v>>2) & 3;
-            if (!sample_rate_code)
-                ast->codec->sample_rate = 5512;
-            else
-                ast->codec->sample_rate = 11025 << (sample_rate_code-1);
+            ast->codec->sample_rate = 44100 >> (3 - sample_rate_code);
             avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
             len -= 4;
         } else if (tag == TAG_VIDEOFRAME) {



More information about the ffmpeg-cvslog mailing list