diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
| commit | bb270c0896b39e1ae9277355e3c120ed3feb64a3 (patch) | |
| tree | fc2fc2b1216d19acb3879abb6ea5a3b400f43fe4 /libavformat/flvdec.c | |
| parent | 50827fcf44f34521df4708cdb633809b56fb9df3 (diff) | |
| download | ffmpeg-bb270c0896b39e1ae9277355e3c120ed3feb64a3.tar.gz | |
COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index e908651214..1be80e32e4 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -155,25 +155,25 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) else st->codec->sample_rate = (44100<<((flags>>2)&3))>>3; 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 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; + // 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); + av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4); st->codec->codec_tag= (flags >> 4); } - st->codec->bits_per_sample = (flags & 2) ? 16 : 8; + st->codec->bits_per_sample = (flags & 2) ? 16 : 8; } }else{ st->codec->codec_type = CODEC_TYPE_VIDEO; 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); + av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf); st->codec->codec_tag= flags & 0xF; } } @@ -189,7 +189,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = st->index; if (is_audio || ((flags >> 4)==1)) - pkt->flags |= PKT_FLAG_KEY; + pkt->flags |= PKT_FLAG_KEY; return ret; } |