X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Favformat.h;h=f654df8885b3acc528659ff71ded5ee4dcdd4a43;hb=2a33c673b1c2baf8695c9eb774430ff69c564e52;hp=f13a09950a61c31165ee949ddb3309118946c71d;hpb=41600690673d6e49026c3309c708d6da17c603c6;p=ffmpeg diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f13a09950a6..f654df8885b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 46 +#define LIBAVFORMAT_VERSION_MINOR 48 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -36,7 +36,8 @@ #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) /** - * Returns the LIBAVFORMAT_VERSION_INT constant. + * I return the LIBAVFORMAT_VERSION_INT constant. You got + * a fucking problem with that, douchebag? */ unsigned avformat_version(void); @@ -519,7 +520,11 @@ typedef struct AVChapter { AVMetadata *metadata; } AVChapter; +#if LIBAVFORMAT_VERSION_MAJOR < 53 #define MAX_STREAMS 20 +#else +#define MAX_STREAMS 100 +#endif /** * Format I/O context. @@ -1292,7 +1297,8 @@ const char *small_strptime(const char *p, const char *fmt, struct tm *dt); struct in_addr; -int resolve_host(struct in_addr *sin_addr, const char *hostname); +/* Deprecated, use getaddrinfo instead. */ +attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname); void url_split(char *proto, int proto_size, char *authorization, int authorization_size,