[FFmpeg-cvslog] r25485 - in trunk/libavformat: avformat.h utils.c
aurel
subversion
Fri Oct 15 15:33:24 CEST 2010
Author: aurel
Date: Fri Oct 15 15:33:23 2010
New Revision: 25485
Log:
add FF_API_PARSE_FRAME_PARAM define to disable the deprecated
parse_image_size() and parse_frame_rate() public functions
Modified:
trunk/libavformat/avformat.h
trunk/libavformat/utils.c
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h Fri Oct 15 15:09:35 2010 (r25484)
+++ trunk/libavformat/avformat.h Fri Oct 15 15:33:23 2010 (r25485)
@@ -66,6 +66,9 @@
#ifndef FF_API_ALLOC_FORMAT_CONTEXT
#define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
+#ifndef FF_API_PARSE_FRAME_PARAM
+#define FF_API_PARSE_FRAME_PARAM (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
/**
* I return the LIBAVFORMAT_VERSION_INT constant. You got
@@ -1425,7 +1428,7 @@ void dump_format(AVFormatContext *ic,
const char *url,
int is_output);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_PARSE_FRAME_PARAM
/**
* Parse width and height out of string str.
* @deprecated Use av_parse_video_frame_size instead.
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c Fri Oct 15 15:09:35 2010 (r25484)
+++ trunk/libavformat/utils.c Fri Oct 15 15:33:23 2010 (r25485)
@@ -3207,7 +3207,7 @@ void dump_format(AVFormatContext *ic,
av_free(printed);
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_PARSE_FRAME_PARAM
#include "libavcore/parseutils.h"
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
More information about the ffmpeg-cvslog
mailing list