diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 00:22:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 00:24:43 +0100 |
| commit | d6b7ea06f19492c0e51a0ba884e048a1b5aaaa86 (patch) | |
| tree | 2ae5249d0d454fba435e1c1bbd6437831403c420 /libavcodec | |
| parent | 6fc9f5e0ff77f827ae0982099b8fcc683bf0063c (diff) | |
| parent | 2a41826bea3833895dc06939831b7f35ca1f597e (diff) | |
| download | ffmpeg-d6b7ea06f19492c0e51a0ba884e048a1b5aaaa86.tar.gz | |
Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
* commit '2a41826bea3833895dc06939831b7f35ca1f597e':
lavc: add HEVC profiles names
Conflicts:
libavcodec/hevc.c
libavcodec/version.h
See: fb7d70c1cd95529cbbbeeab5e9fa3b200ef2545c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc.c | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 2b7dce8317..55328b35e4 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2984,9 +2984,9 @@ static void hevc_decode_flush(AVCodecContext *avctx) #define PAR (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) static const AVProfile profiles[] = { - { FF_PROFILE_HEVC_MAIN, "Main" }, - { FF_PROFILE_HEVC_MAIN_10, "Main10" }, - { FF_PROFILE_HEVC_MAIN_STILL_PICTURE, "MainStillPicture" }, + { FF_PROFILE_HEVC_MAIN, "Main" }, + { FF_PROFILE_HEVC_MAIN_10, "Main 10" }, + { FF_PROFILE_HEVC_MAIN_STILL_PICTURE, "Main Still Picture" }, { FF_PROFILE_UNKNOWN }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 981ae4fb89..1993fa60c0 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 45 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |