From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 27 Nov 2013 10:22:19 +0000 (+0100)
Subject: doc/examples/transcode_aac: remove non converted codepath
X-Git-Tag: android-x86-6.0-r1~8742
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba728c1a2527a02f239fdfaf118a618b758721db;p=android-x86%2Fexternal-ffmpeg.git

doc/examples/transcode_aac: remove non converted codepath

This codepath is not implemented and just crashes, also its simpler
without special cases, which makes sense for an example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c
index cfed0e16b7..35deb4c03e 100644
--- a/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@@ -230,12 +230,6 @@ static int init_resampler(AVCodecContext *input_codec_context,
                           AVCodecContext *output_codec_context,
                           SwrContext **resample_context)
 {
-    /**
-     * Only initialize the resampler if it is necessary, i.e.,
-     * if and only if the sample formats differ.
-     */
-    if (input_codec_context->sample_fmt != output_codec_context->sample_fmt ||
-        input_codec_context->channels != output_codec_context->channels) {
         int error;
 
         /**
@@ -270,7 +264,6 @@ static int init_resampler(AVCodecContext *input_codec_context,
             swr_free(resample_context);
             return error;
         }
-    }
     return 0;
 }