Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
2a41826b
Commit
2a41826b
authored
Dec 18, 2013
by
Gildas Cocherel
Committed by
Anton Khirnov
Dec 20, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add HEVC profiles names
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
f412b2c9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
1 deletion
+18
-1
APIchanges
doc/APIchanges
+3
-0
avcodec.h
libavcodec/avcodec.h
+5
-0
hevc.c
libavcodec/hevc.c
+9
-0
version.h
libavcodec/version.h
+1
-1
No files found.
doc/APIchanges
View file @
2a41826b
...
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
API changes, most recent first:
2013-12-xx - xxxxxxx - lavc 55.30.0 - avcodec.h
Add HEVC profiles
2013-12-xx - xxxxxxx - lavc 55.28.1 - avcodec.h
av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
...
...
libavcodec/avcodec.h
View file @
2a41826b
...
...
@@ -2662,6 +2662,11 @@ typedef struct AVCodecContext {
#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
#define FF_PROFILE_HEVC_MAIN 1
#define FF_PROFILE_HEVC_MAIN_10 2
#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
/**
* level
* - encoding: Set by user.
...
...
libavcodec/hevc.c
View file @
2a41826b
...
...
@@ -3170,6 +3170,14 @@ static void hevc_decode_flush(AVCodecContext *avctx)
#define OFFSET(x) offsetof(HEVCContext, x)
#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
,
"Main 10"
},
{
FF_PROFILE_HEVC_MAIN_STILL_PICTURE
,
"Main Still Picture"
},
{
FF_PROFILE_UNKNOWN
},
};
static
const
AVOption
options
[]
=
{
{
"apply_defdispwin"
,
"Apply default display window from VUI"
,
OFFSET
(
apply_defdispwin
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
1
,
PAR
},
...
...
@@ -3198,4 +3206,5 @@ AVCodec ff_hevc_decoder = {
.
init_thread_copy
=
hevc_init_thread_copy
,
.
capabilities
=
CODEC_CAP_DR1
|
CODEC_CAP_DELAY
|
CODEC_CAP_FRAME_THREADS
,
.
profiles
=
NULL_IF_CONFIG_SMALL
(
profiles
),
};
libavcodec/version.h
View file @
2a41826b
...
...
@@ -27,7 +27,7 @@
*/
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR
29
#define LIBAVCODEC_VERSION_MINOR
30
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment