a52: Fix build error with the recent version

The version check for USE_AVCODEC_FRAME wasn't done correctly, and it
failed to build with version 54.x or later.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index 75c68bd5de6e718ac58dd1e2ccbe1439844bd17d..8fd52c2ee74fa8269f0dc599a3a4177921b79755 100644 (file)
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -28,12 +28,6 @@
 #include AVCODEC_HEADER
 #include <libavutil/avutil.h>
 
-#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34
-#include <libavutil/audioconvert.h>
-#include <libavutil/mem.h>
-#define USE_AVCODEC_FRAME
-#endif
-
 /* some compatibility wrappers */
 #ifndef AV_VERSION_INT
 #define AV_VERSION_INT(a, b, c) (((a) << 16) | ((b) << 8) | (c))
@@ -44,6 +38,12 @@
                                                LIBAVCODEC_VERSION_MICRO)
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
+#include <libavutil/audioconvert.h>
+#include <libavutil/mem.h>
+#define USE_AVCODEC_FRAME
+#endif
+
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 0)
 #ifndef AV_CH_LAYOUT_STEREO
 #define AV_CH_LAYOUT_STEREO    CH_LAYOUT_STEREO