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

Aurelien Jacobs committed 16 years ago

Commit 164bc381 parent d8e45642 files · +5 −2Browse files

Unified · Split

2 files

libavcodec/avcodec.h +4 −1
libavcodec/utils.c +1 −1

libavcodec/avcodec.h+4−1

@@ -60,6 +60,9 @@ · 59 unmodified lines
60	60	#ifndef FF_API_AUDIO_OLD
61	61	#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
62	62	#endif
	63	+#ifndef FF_API_VIDEO_OLD
	64	+#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
	65	+#endif
63	66
64	67	#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
65	68	#define AV_TIME_BASE 1000000
@@ -3524,7 +3527,7 @@ int avcodec_decode_audio3(AVCodecContext avctx, int16_t samples, · 3458 unmodified lines
3524	3527	int *frame_size_ptr,
3525	3528	AVPacket *avpkt);
3526	3529
3527		−#if LIBAVCODEC_VERSION_MAJOR < 53
	3530	+#if FF_API_VIDEO_OLD
3528	3531	/**
3529	3532	* Decode a video frame from buf into picture.
3530	3533	* Wrapper function which calls avcodec_decode_video2.

libavcodec/utils.c+1−1

@@ -591,7 +591,7 @@ int avcodec_encode_subtitle(AVCodecContext avctx, uint8_t buf, int buf_size, · 590 unmodified lines
591	591	return ret;
592	592	}
593	593
594		−#if LIBAVCODEC_VERSION_MAJOR < 53
	594	+#if FF_API_VIDEO_OLD
595	595	int attribute_align_arg avcodec_decode_video(AVCodecContext avctx, AVFrame picture,
596	596	int *got_picture_ptr,
597	597	const uint8_t *buf, int buf_size)