aac: Don't attempt to output configure an invalid channel configuration.

[ffmpeg] / libavcodec / psymodel.h

diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h
index 241f8ecdb3a649e79dd3a42ee917c02d22687415..3e866e40cc2e5b63ae17219099074e4d7c42422c 100644 (file)
--- a/libavcodec/psymodel.h
+++ b/libavcodec/psymodel.h
@@ -111,16 +111,6 @@ typedef struct FFPsyModel {
      */
     FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type);
 
-    /**
-     * Perform psychoacoustic analysis and set band info (threshold, energy) for a single channel.
-     *
-     * @param ctx     model context
-     * @param channel audio channel number
-     * @param coeffs  pointer to the transformed coefficients
-     * @param wi      window information
-     */
-    void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, const FFPsyWindowInfo *wi);
-
     /**
      * Perform psychoacoustic analysis and set band info (threshold, energy) for a group of channels.
      *
@@ -129,7 +119,7 @@ typedef struct FFPsyModel {
      * @param coeffs   array of pointers to the transformed coefficients
      * @param wi       window information for the channels in the group
      */
-    void (*analyze_group)(FFPsyContext *ctx, int channel, const float **coeffs, const FFPsyWindowInfo *wi);
+    void (*analyze)(FFPsyContext *ctx, int channel, const float **coeffs, const FFPsyWindowInfo *wi);
 
     void (*end)    (FFPsyContext *apc);
 } FFPsyModel;