diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2005-02-21 19:28:32 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2005-02-21 19:28:32 +0000 |
| commit | ae26a016b438ee88d678a21d346b8782d8b574b8 (patch) | |
| tree | 2cd9c7d8d1242e8299b4e516190000b7465a33a3 | |
| parent | 659c36925665462a5dec13490359702e48b56160 (diff) | |
| download | ffmpeg-ae26a016b438ee88d678a21d346b8782d8b574b8.tar.gz | |
support adpcm audio, also some more verbose messages
Originally committed as revision 3970 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/flvdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index efe7230af5..157b50dc64 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -124,11 +124,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) switch(flags >> 4){/* 0: uncompressed 1: ADPCM 2: mp3 5: Nellymoser 8kHz mono 6: Nellymoser*/ case 0: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16BE; else st->codec.codec_id = CODEC_ID_PCM_S8; break; + case 1: st->codec.codec_id = CODEC_ID_ADPCM_SWF; break; case 2: st->codec.codec_id = CODEC_ID_MP3; break; // this is not listed at FLV but at SWF, strange... case 3: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16LE; else st->codec.codec_id = CODEC_ID_PCM_S8; break; default: + av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4); st->codec.codec_tag= (flags >> 4); } } @@ -137,6 +139,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) switch(flags & 0xF){ case 2: st->codec.codec_id = CODEC_ID_FLV1; break; default: + av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf); st->codec.codec_tag= flags & 0xF; } } |