[FFmpeg-cvslog] r22924 - trunk/libavformat/iff.c
rbultje
subversion
Tue Apr 20 20:40:45 CEST 2010
Author: rbultje
Date: Tue Apr 20 20:40:45 2010
New Revision: 22924
Log:
Reindent / reformat some code with broken indenting.
Patch by Sebastian Vater <cdgs DOT basty googlemail com>.
Modified:
trunk/libavformat/iff.c
Modified: trunk/libavformat/iff.c
==============================================================================
--- trunk/libavformat/iff.c Tue Apr 20 19:37:06 2010 (r22923)
+++ trunk/libavformat/iff.c Tue Apr 20 20:40:45 2010 (r22924)
@@ -60,8 +60,16 @@
#define PACKET_SIZE 1024
-typedef enum {COMP_NONE, COMP_FIB, COMP_EXP} svx8_compression_type;
-typedef enum {BITMAP_RAW, BITMAP_BYTERUN1} bitmap_compression_type;
+typedef enum {
+ COMP_NONE,
+ COMP_FIB,
+ COMP_EXP
+} svx8_compression_type;
+
+typedef enum {
+ BITMAP_RAW,
+ BITMAP_BYTERUN1
+} bitmap_compression_type;
typedef struct {
uint32_t body_size;
@@ -176,27 +184,27 @@ static int iff_read_header(AVFormatConte
switch(st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
- av_set_pts_info(st, 32, 1, st->codec->sample_rate);
+ av_set_pts_info(st, 32, 1, st->codec->sample_rate);
- switch(compression) {
- case COMP_NONE:
- st->codec->codec_id = CODEC_ID_PCM_S8;
- break;
- case COMP_FIB:
- st->codec->codec_id = CODEC_ID_8SVX_FIB;
- break;
- case COMP_EXP:
- st->codec->codec_id = CODEC_ID_8SVX_EXP;
- break;
- default:
- av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n");
- return -1;
- }
+ switch(compression) {
+ case COMP_NONE:
+ st->codec->codec_id = CODEC_ID_PCM_S8;
+ break;
+ case COMP_FIB:
+ st->codec->codec_id = CODEC_ID_8SVX_FIB;
+ break;
+ case COMP_EXP:
+ st->codec->codec_id = CODEC_ID_8SVX_EXP;
+ break;
+ default:
+ av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n");
+ return -1;
+ }
- st->codec->bits_per_coded_sample = 8;
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
- st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
- break;
+ st->codec->bits_per_coded_sample = 8;
+ st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
+ st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
+ break;
case AVMEDIA_TYPE_VIDEO:
switch (compression) {
More information about the ffmpeg-cvslog
mailing list