[vlc-commits] Avcodec: correctly #ifdef VOXWARE CODEC_ID

Jean-Baptiste Kempf git at videolan.org
Wed Aug 7 11:22:06 CEST 2013


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug  7 11:18:31 2013 +0200| [e7f32425ce063d64c9a38c514a2f9f6cb2c8040c] | committer: Jean-Baptiste Kempf

Avcodec: correctly #ifdef VOXWARE CODEC_ID

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7f32425ce063d64c9a38c514a2f9f6cb2c8040c
---

 modules/codec/avcodec/avcommon_compat.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
index 024b250..3f42c89 100644
--- a/modules/codec/avcodec/avcommon_compat.h
+++ b/modules/codec/avcodec/avcommon_compat.h
@@ -421,7 +421,9 @@ enum {
     AV_CODEC_ID_MLP,
     AV_CODEC_ID_GSM_MS, /* as found in WAV */
     AV_CODEC_ID_ATRAC3,
+#if LIBAVCODEC_VERSION_MAJOR < 56
     AV_CODEC_ID_VOXWARE,
+#endif
     AV_CODEC_ID_APE,
     AV_CODEC_ID_NELLYMOSER,
     AV_CODEC_ID_MUSEPACK8,



More information about the vlc-commits mailing list