[vlc-commits] avcodec: invert definition of deprecated values

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 29 04:17:27 2012 -0500| [37fc3d99becc30a3517869c202b9725ef02311da] | committer: Jean-Baptiste Kempf

avcodec: invert definition of deprecated values

We want to use the new names in our code
(cherry picked from commit 6689109fee1f315dfc1931e5263e9a4aa6f8cff3)

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

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

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

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 3d17ab2..59f3bb5 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -314,12 +314,12 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
 #   define AV_PICTURE_TYPE_I        FF_I_TYPE
 #   define AV_PICTURE_TYPE_P        FF_P_TYPE
 
-#   define SAMPLE_FMT_NONE          AV_SAMPLE_FMT_NONE
-#   define SAMPLE_FMT_U8            AV_SAMPLE_FMT_U8
-#   define SAMPLE_FMT_S16           AV_SAMPLE_FMT_S16
-#   define SAMPLE_FMT_S32           AV_SAMPLE_FMT_S32
-#   define SAMPLE_FMT_FLT           AV_SAMPLE_FMT_FLT
-#   define SAMPLE_FMT_DBL           AV_SAMPLE_FMT_DBL
+#   define AV_SAMPLE_FMT_NONE       SAMPLE_FMT_NONE
+#   define AV_SAMPLE_FMT_U8         SAMPLE_FMT_U8
+#   define AV_SAMPLE_FMT_S16        SAMPLE_FMT_S16
+#   define AV_SAMPLE_FMT_S32        SAMPLE_FMT_S32
+#   define AV_SAMPLE_FMT_FLT        SAMPLE_FMT_FLT
+#   define AV_SAMPLE_FMT_DBL        SAMPLE_FMT_DBL
 
 #ifndef AV_CH_FRONT_LEFT
 #   define AV_CH_FRONT_LEFT         CH_FRONT_LEFT