[vlc-commits] avcodec: revert define of deprecated values

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 29 03:20:34 2012 -0500| [117ea7ef90d5e8ef948646cdb198c80af7008b28] | committer: Jean-Baptiste Kempf

avcodec: revert define of deprecated values

We want to use the new ones in our code
(cherry picked from commit dd74923370c8be69b93eeff99582e9cb43812005)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/avcodec/avcodec.h |   40 +++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 07381c6..904daac 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -321,26 +321,26 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
 #   define SAMPLE_FMT_FLT           AV_SAMPLE_FMT_FLT
 #   define SAMPLE_FMT_DBL           AV_SAMPLE_FMT_DBL
 
-#   define CH_FRONT_LEFT            AV_CH_FRONT_LEFT
-#   define CH_FRONT_RIGHT           AV_CH_FRONT_RIGHT
-#   define CH_FRONT_CENTER          AV_CH_FRONT_CENTER
-#   define CH_LOW_FREQUENCY         AV_CH_LOW_FREQUENCY
-#   define CH_BACK_LEFT             AV_CH_BACK_LEFT
-#   define CH_BACK_RIGHT            AV_CH_BACK_RIGHT
-#   define CH_FRONT_LEFT_OF_CENTER  AV_CH_FRONT_LEFT_OF_CENTER
-#   define CH_FRONT_RIGHT_OF_CENTER AV_CH_FRONT_RIGHT_OF_CENTER
-#   define CH_BACK_CENTER           AV_CH_BACK_CENTER
-#   define CH_SIDE_LEFT             AV_CH_SIDE_LEFT
-#   define CH_SIDE_RIGHT            AV_CH_SIDE_RIGHT
-#   define CH_TOP_CENTER            AV_CH_TOP_CENTER
-#   define CH_TOP_FRONT_LEFT        AV_CH_TOP_FRONT_LEFT
-#   define CH_TOP_FRONT_CENTER      AV_CH_TOP_FRONT_CENTER
-#   define CH_TOP_FRONT_RIGHT       AV_CH_TOP_FRONT_RIGHT
-#   define CH_TOP_BACK_LEFT         AV_CH_TOP_BACK_LEFT
-#   define CH_TOP_BACK_CENTER       AV_CH_TOP_BACK_CENTER
-#   define CH_TOP_BACK_RIGHT        AV_CH_TOP_BACK_RIGHT
-#   define CH_STEREO_LEFT           AV_CH_STEREO_LEFT
-#   define CH_STEREO_RIGHT          AV_CH_STEREO_RIGHT
+#   define AV_CH_FRONT_LEFT         CH_FRONT_LEFT
+#   define AV_CH_FRONT_RIGHT        CH_FRONT_RIGHT
+#   define AV_CH_FRONT_CENTER       CH_FRONT_CENTER
+#   define AV_CH_LOW_FREQUENCY      CH_LOW_FREQUENCY
+#   define AV_CH_BACK_LEFT          CH_BACK_LEFT
+#   define AV_CH_BACK_RIGHT         CH_BACK_RIGHT
+#   define AV_CH_FRONT_LEFT_OF_CENTER  CH_FRONT_LEFT_OF_CENTER
+#   define AV_CH_FRONT_RIGHT_OF_CENTER CH_FRONT_RIGHT_OF_CENTER
+#   define AV_CH_BACK_CENTER        CH_BACK_CENTER
+#   define AV_CH_SIDE_LEFT          CH_SIDE_LEFT
+#   define AV_CH_SIDE_RIGHT         CH_SIDE_RIGHT
+#   define AV_CH_TOP_CENTER         CH_TOP_CENTER
+#   define AV_CH_TOP_FRONT_LEFT     CH_TOP_FRONT_LEFT
+#   define AV_CH_TOP_FRONT_CENTER   CH_TOP_FRONT_CENTER
+#   define AV_CH_TOP_FRONT_RIGHT    CH_TOP_FRONT_RIGHT
+#   define AV_CH_TOP_BACK_LEFT      CH_TOP_BACK_LEFT
+#   define AV_CH_TOP_BACK_CENTER    CH_TOP_BACK_CENTER
+#   define AV_CH_TOP_BACK_RIGHT     CH_TOP_BACK_RIGHT
+#   define AV_CH_STEREO_LEFT        CH_STEREO_LEFT
+#   define AV_CH_STEREO_RIGHT       CH_STEREO_RIGHT
 
 
 #endif