frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavformat / options.c

diff --git a/libavformat/options.c b/libavformat/options.c
index 057de7e305de2fce299fb1b2b5fb3d620ca03df3..a921b91c62c1471f05f480ca51220bc00e62ebc4 100644 (file)
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -21,7 +21,7 @@
 #include "libavcodec/opt.h"
 
 /**
- * @file options.c
+ * @file libavformat/options.c
  * Options definition for AVFormatContext.
  */
 
@@ -46,8 +46,10 @@ static const AVOption options[]={
 {"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D|E, "fflags"},
 {"ignidx", "ignore index", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNIDX, INT_MIN, INT_MAX, D, "fflags"},
 {"genpts", "generate pts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_GENPTS, INT_MIN, INT_MAX, D, "fflags"},
+#if LIBAVFORMAT_VERSION_INT < (53<<16)
 {"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
 {"year", "set the year", OFFSET(year), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, E},
+#endif
 {"analyzeduration", "how many microseconds are analyzed to estimate duration", OFFSET(max_analyze_duration), FF_OPT_TYPE_INT, 3*AV_TIME_BASE, 0, INT_MAX, D},
 {"cryptokey", "decryption key", OFFSET(key), FF_OPT_TYPE_BINARY, 0, 0, 0, D},
 {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), FF_OPT_TYPE_INT, 1<<20, 0, INT_MAX, D},
@@ -72,7 +74,7 @@ static void avformat_get_context_defaults(AVFormatContext *s)
     av_opt_set_defaults(s);
 }
 
-AVFormatContext *av_alloc_format_context(void)
+AVFormatContext *avformat_alloc_context(void)
 {
     AVFormatContext *ic;
     ic = av_malloc(sizeof(AVFormatContext));
@@ -81,3 +83,10 @@ AVFormatContext *av_alloc_format_context(void)
     ic->av_class = &av_format_context_class;
     return ic;
 }
+
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+AVFormatContext *av_alloc_format_context(void)
+{
+    return avformat_alloc_context();
+}
+#endif