History

lavc: add H.264 MVC profiles

Anton Khirnov committed 10 years ago

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

Unified · Split

4 files
  1. doc/APIchanges +3 −0
  2. libavcodec/avcodec.h +2 −0
  3. libavcodec/profiles.c +2 −0
  4. libavcodec/version.h +2 −2
doc/APIchanges+3−0
@@ -13,6 +13,9 @@ libavutil: 2015-08-28 · 12 unmodified lines
13 13
14API changes, most recent first:14API changes, most recent first:
15 15
162016-xx-xx - xxxxxxx - lavc 57.20.0 - avcodec.h
17 Add FF_PROFILE_H264_MULTIVIEW_HIGH and FF_PROFILE_H264_STEREO_HIGH.
18
162016-xx-xx - xxxxxxx - lavu 55.13.0 - hwcontext.h192016-xx-xx - xxxxxxx - lavu 55.13.0 - hwcontext.h
17 Add av_hwdevice_ctx_create().20 Add av_hwdevice_ctx_create().
18 21
libavcodec/avcodec.h+2−0
@@ -2905,8 +2905,10 @@ typedef struct AVCodecContext { · 2904 unmodified lines
2905#define FF_PROFILE_H264_HIGH 1002905#define FF_PROFILE_H264_HIGH 100
2906#define FF_PROFILE_H264_HIGH_10 1102906#define FF_PROFILE_H264_HIGH_10 110
2907#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA)2907#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA)
2908#define FF_PROFILE_H264_MULTIVIEW_HIGH 118
2908#define FF_PROFILE_H264_HIGH_422 1222909#define FF_PROFILE_H264_HIGH_422 122
2909#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA)2910#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA)
2911#define FF_PROFILE_H264_STEREO_HIGH 128
2910#define FF_PROFILE_H264_HIGH_444 1442912#define FF_PROFILE_H264_HIGH_444 144
2911#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 2442913#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
2912#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA)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 { FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" },59 { FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" },
60 { FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" },60 { FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" },
61 { FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" },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 { FF_PROFILE_UNKNOWN },64 { FF_PROFILE_UNKNOWN },
63};65};
64 66
libavcodec/version.h+2−2
@@ -28,8 +28,8 @@ · 27 unmodified lines
28#include "libavutil/version.h"28#include "libavutil/version.h"
29 29
30#define LIBAVCODEC_VERSION_MAJOR 5730#define LIBAVCODEC_VERSION_MAJOR 57
31#define LIBAVCODEC_VERSION_MINOR 1931#define LIBAVCODEC_VERSION_MINOR 20
32#define LIBAVCODEC_VERSION_MICRO 132#define LIBAVCODEC_VERSION_MICRO 0
33 33
34#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \34#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35 LIBAVCODEC_VERSION_MINOR, \35 LIBAVCODEC_VERSION_MINOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t