[FFmpeg-soc] [soc]: r1857 - aac/aac.c

[andoma]

Author: andoma
Date: Thu Jan 31 15:27:53 2008
New Revision: 1857

Log:
Simplify


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Thu Jan 31 15:27:53 2008
@@ -654,11 +654,9 @@ static int GASpecificConfig(AACContext *
  * Parse audio object type
  * reference: Table 1.14
  */
-static inline int GetAudioObjectType(GetBitContext * gb) {
+static int GetAudioObjectType(GetBitContext * gb) {
     int result = get_bits(gb, 5);
-    if (result == 31)
-        result = 32 + get_bits(gb, 6);
-    return result;
+    return result == 31 ? 32 + get_bits(gb, 6) : result;
 }
 
 static inline int GetSampleRate(GetBitContext * gb, int *index, int *rate) {