[SCM] libav/experimental: Reindent.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:20:03 UTC 2013
The following commit has been merged in the experimental branch:
commit f6715848457a98554aec6527bd725a258d7b6aa7
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Sun Dec 12 16:19:40 2010 +0000
Reindent.
Originally committed as revision 25940 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffmpeg.c b/ffmpeg.c
index 4107eed..71e5d3b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -827,18 +827,18 @@ need_realloc:
ost->resample = NULL;
ost->audio_resample = 0;
} else {
- if (dec->sample_fmt != AV_SAMPLE_FMT_S16)
- fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n");
- ost->resample = av_audio_resample_init(enc->channels, dec->channels,
- enc->sample_rate, dec->sample_rate,
- enc->sample_fmt, dec->sample_fmt,
- 16, 10, 0, 0.8);
- if (!ost->resample) {
- fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
- dec->channels, dec->sample_rate,
- enc->channels, enc->sample_rate);
- ffmpeg_exit(1);
- }
+ if (dec->sample_fmt != AV_SAMPLE_FMT_S16)
+ fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n");
+ ost->resample = av_audio_resample_init(enc->channels, dec->channels,
+ enc->sample_rate, dec->sample_rate,
+ enc->sample_fmt, dec->sample_fmt,
+ 16, 10, 0, 0.8);
+ if (!ost->resample) {
+ fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
+ dec->channels, dec->sample_rate,
+ enc->channels, enc->sample_rate);
+ ffmpeg_exit(1);
+ }
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list