[SCM] libav/experimental: add FF_API_PARSE_FRAME_PARAM define to disable the deprecated parse_image_size() and parse_frame_rate() public functions

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d87a521cde2de7f4cbd484cc56fb4b20267ef8df
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Oct 15 13:33:23 2010 +0000

    add FF_API_PARSE_FRAME_PARAM define to disable the deprecated
    parse_image_size() and parse_frame_rate() public functions
    
    Originally committed as revision 25485 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0354f03..940fc65 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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.
diff --git a/libavformat/utils.c b/libavformat/utils.c
index ebcb7d7..56bcfc0 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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)

-- 
Libav/FFmpeg packaging