[FFmpeg-cvslog] r20874 - trunk/libavcodec/aac.c

[David Conrad]

On Dec 15, 2009, at 10:57 AM, cehoyos wrote:

> Author: cehoyos
> Date: Tue Dec 15 16:57:18 2009
> New Revision: 20874
> 
> Log:
> Use enum and constant to avoid three icc warnings.
> 
> Modified:
>   trunk/libavcodec/aac.c
> 
> Modified: trunk/libavcodec/aac.c
> ==============================================================================
> --- trunk/libavcodec/aac.c	Tue Dec 15 14:46:42 2009	(r20873)
> +++ trunk/libavcodec/aac.c	Tue Dec 15 16:57:18 2009	(r20874)
> @@ -1645,8 +1645,9 @@ static void apply_channel_coupling(AACCo
>  */
> static void spectral_to_sample(AACContext *ac)
> {
> -    int i, type;
> -    for (type = 3; type >= 0; type--) {
> +    enum RawDataBlockType type;
> +    for (type = TYPE_LFE; type >= TYPE_SCE; type--) {
> +        int i;

This breaks gcc and clang probably because they assume that an enum cannot have a value other than what's listed, and so assume type >= TYPE_SCE is always true.

The attached patch fixes it.

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: ffmpeg-aac.txt
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20091215/311dfe32/attachment.txt>