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

 #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
                          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.

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

Keyboard shortcuts