libavformat: Split version.h

Martin Storsjö committed 4 years ago

Commit 4eb92321 parent f2da2e122 files · +75 −23Browse files

Showing the changes to libavformat (18 of 22 files). Show all

Unified · Split

18 files

libavformat/Makefile +1 −0
libavformat/avformat.h +1 −1
libavformat/avio.h +1 −1
libavformat/flacenc.c +1 −0
libavformat/framehash.c +1 −0
libavformat/matroskaenc.c +1 −0
libavformat/mmf.c +1 −0
libavformat/movenc.c +1 −0
libavformat/mux.c +1 −0
libavformat/mxfenc.c +1 −0
libavformat/nutenc.c +1 −0
libavformat/oggenc.c +1 −0
libavformat/rtmpproto.c +1 −0
libavformat/rtsp.c +1 −0
libavformat/rtspdec.c +1 −0
libavformat/utils.c +1 −0
libavformat/version.h +2 −21
libavformat/version_major.h +53 −0

@@ -4,6 +4,7 @@ DESC = FFmpeg container format library · 3 unmodified lines
4	HEADERS = avformat.h \	4	HEADERS = avformat.h \
5	avio.h \	5	avio.h \
6	version.h \	6	version.h \
		7	version_major.h \
7		8
8	OBJS = allformats.o \	9	OBJS = allformats.o \
9	avio.o \	10	avio.o \

libavformat/avformat.h+1−1

@@ -319,7 +319,7 @@ · 318 unmodified lines
319	#include "libavutil/log.h"	319	#include "libavutil/log.h"
320		320
321	#include "avio.h"	321	#include "avio.h"
322	#include "libavformat/version.h"	322	#include "libavformat/version_major.h"
323		323
324	struct AVFormatContext;	324	struct AVFormatContext;
325	struct AVStream;	325	struct AVStream;

libavformat/avio.h+1−1

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	#include "libavutil/dict.h"	33	#include "libavutil/dict.h"
34	#include "libavutil/log.h"	34	#include "libavutil/log.h"
35		35
36	#include "libavformat/version.h"	36	#include "libavformat/version_major.h"
37		37
38	/**	38	/**
39	* Seeking works like for a local file.	39	* Seeking works like for a local file.

libavformat/flacenc.c+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	#include "flacenc.h"	30	#include "flacenc.h"
31	#include "id3v2.h"	31	#include "id3v2.h"
32	#include "internal.h"	32	#include "internal.h"
		33	#include "version.h"
33	#include "vorbiscomment.h"	34	#include "vorbiscomment.h"
34		35
35		36

libavformat/framehash.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20		20
21	#include "libavutil/channel_layout.h"	21	#include "libavutil/channel_layout.h"
22	#include "internal.h"	22	#include "internal.h"
		23	#include "version.h"
23		24
24	int ff_framehash_write_header(AVFormatContext *s)	25	int ff_framehash_write_header(AVFormatContext *s)
25	{	26	{

libavformat/matroskaenc.c+1−0

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	#include "isom.h"	35	#include "isom.h"
36	#include "matroska.h"	36	#include "matroska.h"
37	#include "riff.h"	37	#include "riff.h"
		38	#include "version.h"
38	#include "vorbiscomment.h"	39	#include "vorbiscomment.h"
39	#include "wv.h"	40	#include "wv.h"
40		41

libavformat/mmf.c+1−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	#include "pcm.h"	26	#include "pcm.h"
27	#include "rawenc.h"	27	#include "rawenc.h"
28	#include "riff.h"	28	#include "riff.h"
		29	#include "version.h"
29		30
30	typedef struct MMFContext {	31	typedef struct MMFContext {
31	int64_t atrpos, atsqpos, awapos;	32	int64_t atrpos, atsqpos, awapos;

libavformat/movenc.c+1−0

@@ -60,6 +60,7 @@ · 59 unmodified lines
60	#include "mov_chan.h"	60	#include "mov_chan.h"
61	#include "movenc_ttml.h"	61	#include "movenc_ttml.h"
62	#include "ttmlenc.h"	62	#include "ttmlenc.h"
		63	#include "version.h"
63	#include "vpcc.h"	64	#include "vpcc.h"
64		65
65	static const AVOption options[] = {	66	static const AVOption options[] = {

libavformat/mux.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21		21
22	#include "avformat.h"	22	#include "avformat.h"
23	#include "internal.h"	23	#include "internal.h"
		24	#include "version.h"
24	#include "libavcodec/bsf.h"	25	#include "libavcodec/bsf.h"
25	#include "libavcodec/internal.h"	26	#include "libavcodec/internal.h"
26	#include "libavcodec/packet_internal.h"	27	#include "libavcodec/packet_internal.h"

libavformat/mxfenc.c+1−0

@@ -58,6 +58,7 @@ · 57 unmodified lines
58	#include "avc.h"	58	#include "avc.h"
59	#include "mxf.h"	59	#include "mxf.h"
60	#include "config.h"	60	#include "config.h"
		61	#include "version.h"
61		62
62	extern const AVOutputFormat ff_mxf_d10_muxer;	63	extern const AVOutputFormat ff_mxf_d10_muxer;
63	extern const AVOutputFormat ff_mxf_opatom_muxer;	64	extern const AVOutputFormat ff_mxf_opatom_muxer;

libavformat/nutenc.c+1−0

@@ -34,6 +34,7 @@ · 33 unmodified lines
34	#include "internal.h"	34	#include "internal.h"
35	#include "avio_internal.h"	35	#include "avio_internal.h"
36	#include "riff.h"	36	#include "riff.h"
		37	#include "version.h"
37		38
38	static int find_expected_header(AVCodecParameters *p, int size, int key_frame,	39	static int find_expected_header(AVCodecParameters *p, int size, int key_frame,
39	uint8_t out[64])	40	uint8_t out[64])

libavformat/oggenc.c+1−0

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	#include "avformat.h"	31	#include "avformat.h"
32	#include "avio_internal.h"	32	#include "avio_internal.h"
33	#include "internal.h"	33	#include "internal.h"
		34	#include "version.h"
34	#include "vorbiscomment.h"	35	#include "vorbiscomment.h"
35		36
36	#define MAX_PAGE_SIZE 65025	37	#define MAX_PAGE_SIZE 65025

libavformat/rtmpproto.c+1−0

@@ -42,6 +42,7 @@ · 41 unmodified lines
42	#include "rtmpcrypt.h"	42	#include "rtmpcrypt.h"
43	#include "rtmppkt.h"	43	#include "rtmppkt.h"
44	#include "url.h"	44	#include "url.h"
		45	#include "version.h"
45		46
46	#if CONFIG_ZLIB	47	#if CONFIG_ZLIB
47	#include <zlib.h>	48	#include <zlib.h>

libavformat/rtsp.c+1−0

@@ -50,6 +50,7 @@ · 49 unmodified lines
50	#include "url.h"	50	#include "url.h"
51	#include "rtpenc.h"	51	#include "rtpenc.h"
52	#include "mpegts.h"	52	#include "mpegts.h"
		53	#include "version.h"
53		54
54	/* Default timeout values for read packet in seconds */	55	/* Default timeout values for read packet in seconds */
55	#define READ_PACKET_TIMEOUT_S 10	56	#define READ_PACKET_TIMEOUT_S 10

libavformat/rtspdec.c+1−0

@@ -34,6 +34,7 @@ · 33 unmodified lines
34	#include "rdt.h"	34	#include "rdt.h"
35	#include "tls.h"	35	#include "tls.h"
36	#include "url.h"	36	#include "url.h"
		37	#include "version.h"
37		38
38	static const struct RTSPStatusMessage {	39	static const struct RTSPStatusMessage {
39	enum RTSPStatusCode code;	40	enum RTSPStatusCode code;

libavformat/utils.c+1−0

@@ -46,6 +46,7 @@ · 45 unmodified lines
46	#if CONFIG_NETWORK	46	#if CONFIG_NETWORK
47	#include "network.h"	47	#include "network.h"
48	#endif	48	#endif
		49	#include "version.h"
49		50
50	#include "libavutil/ffversion.h"	51	#include "libavutil/ffversion.h"
51	const char av_format_ffversion[] = "FFmpeg version " FFMPEG_VERSION;	52	const char av_format_ffversion[] = "FFmpeg version " FFMPEG_VERSION;

libavformat/version.h+2−21

@@ -29,9 +29,8 @@ · 28 unmodified lines
29		29
30	#include "libavutil/version.h"	30	#include "libavutil/version.h"
31		31
32	// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)	32	#include "version_major.h"
33	// Also please add any ticket numbers that you believe might be affected here	33
34	#define LIBAVFORMAT_VERSION_MAJOR 59
35	#define LIBAVFORMAT_VERSION_MINOR 19	34	#define LIBAVFORMAT_VERSION_MINOR 19
36	#define LIBAVFORMAT_VERSION_MICRO 100	35	#define LIBAVFORMAT_VERSION_MICRO 100
37		36
@@ -45,22 +44,4 @@ · 7 unmodified lines
45		44
46	#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)	45	#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
47		46
48	/**
49	* FF_API_* defines may be placed below to indicate public API that will be
50	* dropped at a future version bump. The defines themselves are not part of
51	* the public API and may change, break or disappear at any time.
52	*
53	* @note, when bumping the major version it is recommended to manually
54	* disable each FF_API_* in its own commit instead of disabling them all
55	* at once through the bump. This improves the git bisect-ability of the change.
56	*
57	*/
58	#define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60)
59	#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
60	#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60)
61	#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)
62	#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
63
64
65	#define FF_API_R_FRAME_RATE 1
66	#endif /* AVFORMAT_VERSION_H */	47	#endif /* AVFORMAT_VERSION_H */

libavformat/version_major.h+53−0

@@ -0,0 +1,53 @@
	1	/*
	2	* Version macros.
	3	*
	4	* This file is part of FFmpeg.
	5	*
	6	* FFmpeg is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU Lesser General Public
	8	* License as published by the Free Software Foundation; either
	9	* version 2.1 of the License, or (at your option) any later version.
	10	*
	11	* FFmpeg is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	14	* Lesser General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU Lesser General Public
	17	* License along with FFmpeg; if not, write to the Free Software
	18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	19	*/
	20
	21	#ifndef AVFORMAT_VERSION_MAJOR_H
	22	#define AVFORMAT_VERSION_MAJOR_H
	23
	24	/**
	25	* @file
	26	* @ingroup libavf
	27	* Libavformat version macros
	28	*/
	29
	30	// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
	31	// Also please add any ticket numbers that you believe might be affected here
	32	#define LIBAVFORMAT_VERSION_MAJOR 59
	33
	34	/**
	35	* FF_API_* defines may be placed below to indicate public API that will be
	36	* dropped at a future version bump. The defines themselves are not part of
	37	* the public API and may change, break or disappear at any time.
	38	*
	39	* @note, when bumping the major version it is recommended to manually
	40	* disable each FF_API_* in its own commit instead of disabling them all
	41	* at once through the bump. This improves the git bisect-ability of the change.
	42	*
	43	*/
	44	#define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60)
	45	#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
	46	#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60)
	47	#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)
	48	#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
	49
	50
	51	#define FF_API_R_FRAME_RATE 1
	52
	53	#endif /* AVFORMAT_VERSION_MAJOR_H */

libavformat: Split version.h

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code