[FFmpeg-cvslog] Merge commit '90f469aa2b98a868cdbe35170c24272de10e1341'
Clément Bœsch
git at videolan.org
Sat Jul 9 14:06:03 CEST 2016
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jul 9 14:01:28 2016 +0200| [775389fc59bc46ac00babc1baf35e273e65f8541] | committer: Clément Bœsch
Merge commit '90f469aa2b98a868cdbe35170c24272de10e1341'
* commit '90f469aa2b98a868cdbe35170c24272de10e1341':
lavc: add H.264 MVC profiles
Merged-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=775389fc59bc46ac00babc1baf35e273e65f8541
---
doc/APIchanges | 3 +++
libavcodec/avcodec.h | 2 ++
libavcodec/profiles.c | 2 ++
libavcodec/version.h | 4 ++--
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 52cd48c..bcd329f 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first:
+2016-07-09 - xxxxxxx / 90f469a - lavc 57.50.100 / 57.20.0 - avcodec.h
+ Add FF_PROFILE_H264_MULTIVIEW_HIGH and FF_PROFILE_H264_STEREO_HIGH.
+
2016-06-30 - c1c7e0ab - lavf 57.41.100 - avformat.h
Moved codecpar field from AVStream to the end of the struct, so that
the following private fields are in the same location as in FFmpeg 3.0 (lavf 57.25.100).
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 39713ed..6a7dc3d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3189,8 +3189,10 @@ typedef struct AVCodecContext {
#define FF_PROFILE_H264_HIGH 100
#define FF_PROFILE_H264_HIGH_10 110
#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_MULTIVIEW_HIGH 118
#define FF_PROFILE_H264_HIGH_422 122
#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_STEREO_HIGH 128
#define FF_PROFILE_H264_HIGH_444 144
#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA)
diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c
index da745e1..0984704 100644
--- a/libavcodec/profiles.c
+++ b/libavcodec/profiles.c
@@ -60,6 +60,8 @@ const AVProfile ff_h264_profiles[] = {
{ FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" },
{ FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" },
{ FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" },
+ { FF_PROFILE_H264_MULTIVIEW_HIGH, "Multiview High" },
+ { FF_PROFILE_H264_STEREO_HIGH, "Stereo High" },
{ FF_PROFILE_UNKNOWN },
};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 71c85db..f588316 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 49
-#define LIBAVCODEC_VERSION_MICRO 103
+#define LIBAVCODEC_VERSION_MINOR 50
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
======================================================================
diff --cc doc/APIchanges
index 52cd48c,de0213f..bcd329f
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,31 -13,16 +15,34 @@@ libavutil: 2015-08-2
API changes, most recent first:
-2016-xx-xx - xxxxxxx - lavc 57.20.0 - avcodec.h
++2016-07-09 - xxxxxxx / 90f469a - lavc 57.50.100 / 57.20.0 - avcodec.h
+ Add FF_PROFILE_H264_MULTIVIEW_HIGH and FF_PROFILE_H264_STEREO_HIGH.
+
-2016-xx-xx - xxxxxxx - lavu 55.13.0 - hwcontext.h
+2016-06-30 - c1c7e0ab - lavf 57.41.100 - avformat.h
+ Moved codecpar field from AVStream to the end of the struct, so that
+ the following private fields are in the same location as in FFmpeg 3.0 (lavf 57.25.100).
+
+2016-06-30 - 042fb69d - lavu 55.28.100 - frame.h
+ Moved hw_frames_ctx field from AVFrame to the end of the struct, so that
+ the following private fields are in the same location as in FFmpeg 3.0 (lavu 55.17.103).
+
+2016-06-29 - 1a751455 - lavfi 6.47.100 - avfilter.h
+ Fix accidental ABI breakage in AVFilterContext.
+ ABI was broken in 8688d3a, lavfi 6.42.100 and released as ffmpeg 3.1.
+
+ Because of this, ffmpeg and ffplay built against lavfi>=6.42.100 will not be
+ compatible with lavfi>=6.47.100. Potentially also affects other users of
+ libavfilter if they are using one of the affected fields.
+
+-------- 8< --------- FFmpeg 3.1 was cut here -------- 8< ---------
+
+2016-06-26 - 481f320 / 1c9e861 - lavu 55.27.100 / 55.13.0 - hwcontext.h
Add av_hwdevice_ctx_create().
-2016-xx-xx - xxxxxxx - lavc 57.19.1 - avcodec.h
+2016-06-26 - b95534b / e47b8bb - lavc 57.48.101 / 57.19.1 - avcodec.h
Adjust values for JPEG 2000 profiles.
-2016-xx-xx - xxxxxxx - lavf 57.7.0 - avio.h
+2016-06-23 - 5d75e46 / db7968b - lavf 57.40.100 / 57.7.0 - avio.h
Add AVIODataMarkerType, write_data_type, ignore_boundary_point and
avio_write_marker.
diff --cc libavcodec/version.h
index 71c85db,ad7e19d..f588316
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -27,9 -27,9 +27,9 @@@
#include "libavutil/version.h"
-#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 20
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MAJOR 57
- #define LIBAVCODEC_VERSION_MINOR 49
- #define LIBAVCODEC_VERSION_MICRO 103
++#define LIBAVCODEC_VERSION_MINOR 50
++#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list