diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-02-20 21:43:55 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-02-20 21:49:23 +0100 |
| commit | 624fb5f96544fd39d69abc5cadbba3f801d673b1 (patch) | |
| tree | a9479053daefa08892a3d9ce426783836d4afa0a /libavformat/swfdec.c | |
| parent | 9a0076f50cfc2c6027154d93d88615b865bba64c (diff) | |
| download | android_external_ffmpeg-624fb5f96544fd39d69abc5cadbba3f801d673b1.tar.gz android_external_ffmpeg-624fb5f96544fd39d69abc5cadbba3f801d673b1.tar.bz2 android_external_ffmpeg-624fb5f96544fd39d69abc5cadbba3f801d673b1.zip | |
lavf/swfdec: support 8-bits PCM audio.
Diffstat (limited to 'libavformat/swfdec.c')
| -rw-r--r-- | libavformat/swfdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 9e243f5e6c..5f64995b6c 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -140,7 +140,7 @@ static int swf_read_header(AVFormatContext *s) static AVStream *create_new_audio_stream(AVFormatContext *s, int id, int info) { - int sample_rate_code; + int sample_rate_code, sample_size_code; AVStream *ast = avformat_new_stream(s, NULL); if (!ast) return NULL; @@ -156,6 +156,9 @@ static AVStream *create_new_audio_stream(AVFormatContext *s, int id, int info) ast->codec->codec_id = ff_codec_get_id(swf_audio_codec_tags, info>>4 & 15); ast->need_parsing = AVSTREAM_PARSE_FULL; sample_rate_code = info>>2 & 3; + sample_size_code = info>>1 & 1; + if (!sample_size_code && ast->codec->codec_id == AV_CODEC_ID_PCM_S16LE) + ast->codec->codec_id = AV_CODEC_ID_PCM_U8; ast->codec->sample_rate = 44100 >> (3 - sample_rate_code); avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate); return ast; |