diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2009-12-14 03:30:25 +0000 |
|---|---|---|
| committer | Daniel Verkamp <daniel@drv.nu> | 2009-12-14 03:30:25 +0000 |
| commit | 8e9efe439216d0bc7dbd9e9f4d2baa4b2aeaff30 (patch) | |
| tree | 87925729c2321d17386b256c022bbf33a661b5e0 /libavformat/flvdec.c | |
| parent | 22b16e6a5db14f6b10525fab69e1c0b58cfa899b (diff) | |
| download | ffmpeg-8e9efe439216d0bc7dbd9e9f4d2baa4b2aeaff30.tar.gz | |
FLV 8-bit PCM is unsigned, not signed
Fixes issue #1569
Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index c6428b4bbc..29c63dbc39 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -50,7 +50,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags case FLV_CODECID_PCM: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : #if HAVE_BIGENDIAN CODEC_ID_PCM_S16BE; #else @@ -58,7 +58,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c #endif break; case FLV_CODECID_PCM_LE: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break; + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : CODEC_ID_PCM_S16LE; break; case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break; case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break; case FLV_CODECID_SPEEX: |