lavc: add H.264 MVC profiles

Anton Khirnov committed 10 years ago

Commit 90f469a1 parent 61f168a4 files · +9 −2Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavcodec/avcodec.h +2 −0
libavcodec/profiles.c +2 −0
libavcodec/version.h +2 −2

doc/APIchanges+3−0

@@ -13,6 +13,9 @@ libavutil: 2015-08-28 · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2016-xx-xx - xxxxxxx - lavc 57.20.0 - avcodec.h
	17	+ Add FF_PROFILE_H264_MULTIVIEW_HIGH and FF_PROFILE_H264_STEREO_HIGH.
	18	+
16	19	2016-xx-xx - xxxxxxx - lavu 55.13.0 - hwcontext.h
17	20	Add av_hwdevice_ctx_create().
18	21

libavcodec/avcodec.h+2−0

@@ -2905,8 +2905,10 @@ typedef struct AVCodecContext { · 2904 unmodified lines
2905	2905	#define FF_PROFILE_H264_HIGH 100
2906	2906	#define FF_PROFILE_H264_HIGH_10 110
2907	2907	#define FF_PROFILE_H264_HIGH_10_INTRA (110\|FF_PROFILE_H264_INTRA)
	2908	+#define FF_PROFILE_H264_MULTIVIEW_HIGH 118
2908	2909	#define FF_PROFILE_H264_HIGH_422 122
2909	2910	#define FF_PROFILE_H264_HIGH_422_INTRA (122\|FF_PROFILE_H264_INTRA)
	2911	+#define FF_PROFILE_H264_STEREO_HIGH 128
2910	2912	#define FF_PROFILE_H264_HIGH_444 144
2911	2913	#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
2912	2914	#define FF_PROFILE_H264_HIGH_444_INTRA (244\|FF_PROFILE_H264_INTRA)

libavcodec/profiles.c+2−0

@@ -59,6 +59,8 @@ const AVProfile ff_h264_profiles[] = { · 58 unmodified lines
59	59	{ FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" },
60	60	{ FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" },
61	61	{ FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" },
	62	+ { FF_PROFILE_H264_MULTIVIEW_HIGH, "Multiview High" },
	63	+ { FF_PROFILE_H264_STEREO_HIGH, "Stereo High" },
62	64	{ FF_PROFILE_UNKNOWN },
63	65	};
64	66

libavcodec/version.h+2−2

@@ -28,8 +28,8 @@ · 27 unmodified lines
28	28	#include "libavutil/version.h"
29	29
30	30	#define LIBAVCODEC_VERSION_MAJOR 57
31		−#define LIBAVCODEC_VERSION_MINOR 19
32		−#define LIBAVCODEC_VERSION_MICRO 1
	31	+#define LIBAVCODEC_VERSION_MINOR 20
	32	+#define LIBAVCODEC_VERSION_MICRO 0
33	33
34	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35	35	LIBAVCODEC_VERSION_MINOR, \