[SCM] libav/experimental: AAC: Mark functions that are only called when the output configuration is not locked as av_cold.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:06 UTC 2013


The following commit has been merged in the experimental branch:
commit ff98c17cba7698f851276b53f87446e72aeda4a4
Author: Alex Converse <alex.converse at gmail.com>
Date:   Mon Feb 15 16:19:46 2010 +0000

    AAC: Mark functions that are only called when the output configuration is not locked as av_cold.
    
    Originally committed as revision 21833 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 90581fc..fdb054c 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -196,7 +196,7 @@ static int che_configure(AACContext *ac,
  *
  * @return  Returns error status. 0 - OK, !0 - error
  */
-static int output_configure(AACContext *ac,
+static av_cold int output_configure(AACContext *ac,
                             enum ChannelPosition che_pos[4][MAX_ELEM_ID],
                             enum ChannelPosition new_che_pos[4][MAX_ELEM_ID],
                             int channel_config, enum OCStatus oc_type)
@@ -324,7 +324,7 @@ static int decode_pce(AACContext *ac, enum ChannelPosition new_che_pos[4][MAX_EL
  *
  * @return  Returns error status. 0 - OK, !0 - error
  */
-static int set_default_channel_config(AACContext *ac,
+static av_cold int set_default_channel_config(AACContext *ac,
                                       enum ChannelPosition new_che_pos[4][MAX_ELEM_ID],
                                       int channel_config)
 {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list