[SCM] libav/experimental: add FF_API_VIDEO_OLD define to disable the deprecated decode_video API
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:16:40 UTC 2013
The following commit has been merged in the experimental branch:
commit 164bc38c2603e8738237d61a183f95e283f3e491
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Thu Sep 30 19:51:22 2010 +0000
add FF_API_VIDEO_OLD define to disable the deprecated decode_video API
Originally committed as revision 25272 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e701a82..880ce5a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -60,6 +60,9 @@
#ifndef FF_API_AUDIO_OLD
#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif
+#ifndef FF_API_VIDEO_OLD
+#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000
@@ -3524,7 +3527,7 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
int *frame_size_ptr,
AVPacket *avpkt);
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_VIDEO_OLD
/**
* Decode a video frame from buf into picture.
* Wrapper function which calls avcodec_decode_video2.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 69439b8..0d27163 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -591,7 +591,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
return ret;
}
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_VIDEO_OLD
int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr,
const uint8_t *buf, int buf_size)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list