add FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API

Originally committed as revision 25273 to svn://svn.ffmpeg.org/ffmpeg/trunk

Aurelien Jacobs committed 16 years ago

Commit 448ce921 parent 164bc382 files · +5 −2Browse files

Unified · Split

2 files

 #ifndef FF_API_VIDEO_OLD
 #define FF_API_VIDEO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_SUBTITLE_OLD
+#define FF_API_SUBTITLE_OLD     (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
 #define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
 #define AV_TIME_BASE            1000000
                          int *got_picture_ptr,
                          AVPacket *avpkt);
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_SUBTITLE_OLD
 /* Decode a subtitle message. Return -1 if error, otherwise return the
  * number of bytes used. If no subtitle could be decompressed,
  * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */

@@ -671,7 +671,7 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext avctx, int16_t sa · 670 unmodified lines
671	return ret;	671	return ret;
672	}	672	}
673		673
674	#if LIBAVCODEC_VERSION_MAJOR < 53	674	#if FF_API_SUBTITLE_OLD
675	int avcodec_decode_subtitle(AVCodecContext avctx, AVSubtitle sub,	675	int avcodec_decode_subtitle(AVCodecContext avctx, AVSubtitle sub,
676	int *got_sub_ptr,	676	int *got_sub_ptr,
677	const uint8_t *buf, int buf_size)	677	const uint8_t *buf, int buf_size)

Keyboard shortcuts