Depending on whether the mpegaudio code is compiled in float or int mode,
some av_log invocations may require printf conversion specifiers for int
or float arguments; FF_PRIx_or_e provides the correct one.
---
libavcodec/mpegaudio.h | 3 +++
libavcodec/mpegaudiodec.c | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index b556801..d4848b8 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -58,14 +58,17 @@
#if CONFIG_FLOAT
# define INTFLOAT float
+# define FF_PRIx_or_e "e"
typedef float MPA_INT;
typedef float OUT_INT;
#elif FRAC_BITS <= 15
# define INTFLOAT int
+# define FF_PRIx_or_e "x"
typedef int16_t MPA_INT;
typedef int16_t OUT_INT;
#else
# define INTFLOAT int
+# define FF_PRIx_or_e "x"
typedef int32_t MPA_INT;
typedef int16_t OUT_INT;
#endif
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index ccc93ad..821b6f0 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -431,7 +431,7 @@ static av_cold int decode_init(AVCodecContext * avctx)
k = i & 1;
is_table_lsf[j][k ^ 1][i] = FIXR(f);
is_table_lsf[j][k][i] = FIXR(1.0);
- av_dlog(avctx, "is_table_lsf %d %d: %x %x\n",
+ av_dlog(avctx, "is_table_lsf %d %d: %"FF_PRIx_or_e"
%"FF_PRIx_or_e"\n",
i, j, is_table_lsf[j][0][i], is_table_lsf[j][1][i]);
}
}
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
