vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Sun Jan 29 03:57:08 2012 -0500| [167c370dc4355bf8f0f52b1b3a74cdc4f52e4b67] | committer: Jean-Baptiste Kempf
avcodec: fix build with libavcodec < 54 (cherry picked from commit 1ed476774fee834da7b4dba4d38a8a41c1908890) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=167c370dc4355bf8f0f52b1b3a74cdc4f52e4b67 --- modules/codec/avcodec/avcodec.h | 40 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index 904daac..3d17ab2 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -321,26 +321,66 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); # define SAMPLE_FMT_FLT AV_SAMPLE_FMT_FLT # define SAMPLE_FMT_DBL AV_SAMPLE_FMT_DBL +#ifndef AV_CH_FRONT_LEFT # define AV_CH_FRONT_LEFT CH_FRONT_LEFT +#endif +#ifndef AV_CH_FRONT_RIGHT # define AV_CH_FRONT_RIGHT CH_FRONT_RIGHT +#endif +#ifndef AV_CH_FRONT_CENTER # define AV_CH_FRONT_CENTER CH_FRONT_CENTER +#endif +#ifndef AV_CH_LOW_FREQUENCY # define AV_CH_LOW_FREQUENCY CH_LOW_FREQUENCY +#endif +#ifndef AV_CH_BACK_LEFT # define AV_CH_BACK_LEFT CH_BACK_LEFT +#endif +#ifndef AV_CH_BACK_RIGHT # define AV_CH_BACK_RIGHT CH_BACK_RIGHT +#endif +#ifndef AV_CH_FRONT_LEFT_OF_CENTER # define AV_CH_FRONT_LEFT_OF_CENTER CH_FRONT_LEFT_OF_CENTER +#endif +#ifndef AV_CH_FRONT_RIGHT_OF_CENTER # define AV_CH_FRONT_RIGHT_OF_CENTER CH_FRONT_RIGHT_OF_CENTER +#endif +#ifndef AV_CH_BACK_CENTER # define AV_CH_BACK_CENTER CH_BACK_CENTER +#endif +#ifndef AV_CH_SIDE_LEFT # define AV_CH_SIDE_LEFT CH_SIDE_LEFT +#endif +#ifndef AV_CH_SIDE_RIGHT # define AV_CH_SIDE_RIGHT CH_SIDE_RIGHT +#endif +#ifndef AV_CH_TOP_CENTER # define AV_CH_TOP_CENTER CH_TOP_CENTER +#endif +#ifndef AV_CH_TOP_FRONT_LEFT # define AV_CH_TOP_FRONT_LEFT CH_TOP_FRONT_LEFT +#endif +#ifndef AV_CH_TOP_FRONT_CENTER # define AV_CH_TOP_FRONT_CENTER CH_TOP_FRONT_CENTER +#endif +#ifndef AV_CH_TOP_FRONT_RIGHT # define AV_CH_TOP_FRONT_RIGHT CH_TOP_FRONT_RIGHT +#endif +#ifndef AV_CH_TOP_BACK_LEFT # define AV_CH_TOP_BACK_LEFT CH_TOP_BACK_LEFT +#endif +#ifndef AV_CH_TOP_BACK_CENTER # define AV_CH_TOP_BACK_CENTER CH_TOP_BACK_CENTER +#endif +#ifndef AV_CH_TOP_BACK_RIGHT # define AV_CH_TOP_BACK_RIGHT CH_TOP_BACK_RIGHT +#endif +#ifndef AV_CH_STEREO_LEFT # define AV_CH_STEREO_LEFT CH_STEREO_LEFT +#endif +#ifndef AV_CH_STEREO_RIGHT # define AV_CH_STEREO_RIGHT CH_STEREO_RIGHT +#endif #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
