[FFmpeg-cvslog] examples/muxing: reindent after previous commit

Stefano Sabatini git at videolan.org
Thu Jan 23 01:08:57 CET 2014


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jan 23 01:08:24 2014 +0100| [35fe88bb51692612858cb78b3d2f11274adf554e] | committer: Stefano Sabatini

examples/muxing: reindent after previous commit

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35fe88bb51692612858cb78b3d2f11274adf554e
---

 doc/examples/muxing.c |   64 ++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
index b0c91a8..a849e0a 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
@@ -265,41 +265,41 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st, int flush)
     c = st->codec;
 
     if (!flush) {
-    get_audio_frame((int16_t *)src_samples_data[0], src_nb_samples, c->channels);
-
-    /* convert samples from native format to destination codec format, using the resampler */
-    if (swr_ctx) {
-        /* compute destination number of samples */
-        dst_nb_samples = av_rescale_rnd(swr_get_delay(swr_ctx, c->sample_rate) + src_nb_samples,
-                                        c->sample_rate, c->sample_rate, AV_ROUND_UP);
-        if (dst_nb_samples > max_dst_nb_samples) {
-            av_free(dst_samples_data[0]);
-            ret = av_samples_alloc(dst_samples_data, &dst_samples_linesize, c->channels,
-                                   dst_nb_samples, c->sample_fmt, 0);
-            if (ret < 0)
-                exit(1);
-            max_dst_nb_samples = dst_nb_samples;
-            dst_samples_size = av_samples_get_buffer_size(NULL, c->channels, dst_nb_samples,
-                                                          c->sample_fmt, 0);
-        }
+        get_audio_frame((int16_t *)src_samples_data[0], src_nb_samples, c->channels);
+
+        /* convert samples from native format to destination codec format, using the resampler */
+        if (swr_ctx) {
+            /* compute destination number of samples */
+            dst_nb_samples = av_rescale_rnd(swr_get_delay(swr_ctx, c->sample_rate) + src_nb_samples,
+                                            c->sample_rate, c->sample_rate, AV_ROUND_UP);
+            if (dst_nb_samples > max_dst_nb_samples) {
+                av_free(dst_samples_data[0]);
+                ret = av_samples_alloc(dst_samples_data, &dst_samples_linesize, c->channels,
+                                       dst_nb_samples, c->sample_fmt, 0);
+                if (ret < 0)
+                    exit(1);
+                max_dst_nb_samples = dst_nb_samples;
+                dst_samples_size = av_samples_get_buffer_size(NULL, c->channels, dst_nb_samples,
+                                                              c->sample_fmt, 0);
+            }
 
-        /* convert to destination format */
-        ret = swr_convert(swr_ctx,
-                          dst_samples_data, dst_nb_samples,
-                          (const uint8_t **)src_samples_data, src_nb_samples);
-        if (ret < 0) {
-            fprintf(stderr, "Error while converting\n");
-            exit(1);
+            /* convert to destination format */
+            ret = swr_convert(swr_ctx,
+                              dst_samples_data, dst_nb_samples,
+                              (const uint8_t **)src_samples_data, src_nb_samples);
+            if (ret < 0) {
+                fprintf(stderr, "Error while converting\n");
+                exit(1);
+            }
+        } else {
+            dst_nb_samples = src_nb_samples;
         }
-    } else {
-        dst_nb_samples = src_nb_samples;
-    }
 
-    audio_frame->nb_samples = dst_nb_samples;
-    audio_frame->pts = av_rescale_q(samples_count, (AVRational){1, c->sample_rate}, c->time_base);
-    avcodec_fill_audio_frame(audio_frame, c->channels, c->sample_fmt,
-                             dst_samples_data[0], dst_samples_size, 0);
-    samples_count += dst_nb_samples;
+        audio_frame->nb_samples = dst_nb_samples;
+        audio_frame->pts = av_rescale_q(samples_count, (AVRational){1, c->sample_rate}, c->time_base);
+        avcodec_fill_audio_frame(audio_frame, c->channels, c->sample_fmt,
+                                 dst_samples_data[0], dst_samples_size, 0);
+        samples_count += dst_nb_samples;
     }
 
     ret = avcodec_encode_audio2(c, &pkt, flush ? NULL : audio_frame, &got_packet);



More information about the ffmpeg-cvslog mailing list