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
71e0bee9
Commit
71e0bee9
authored
Jan 21, 2011
by
Anssi Hannula
Committed by
Janne Grunau
Feb 01, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: add profile names for the existing defines
Signed-off-by:
Janne Grunau
<
janne-ffmpeg@jannau.net
>
parent
fe9a3fbe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
0 deletions
+17
-0
h264.c
libavcodec/h264.c
+17
-0
No files found.
libavcodec/h264.c
View file @
71e0bee9
...
@@ -3386,6 +3386,21 @@ av_cold int ff_h264_decode_end(AVCodecContext *avctx)
...
@@ -3386,6 +3386,21 @@ av_cold int ff_h264_decode_end(AVCodecContext *avctx)
return
0
;
return
0
;
}
}
static
const
AVProfile
profiles
[]
=
{
{
FF_PROFILE_H264_BASELINE
,
"Baseline"
},
{
FF_PROFILE_H264_CONSTRAINED_BASELINE
,
"Constrained Baseline"
},
{
FF_PROFILE_H264_MAIN
,
"Main"
},
{
FF_PROFILE_H264_EXTENDED
,
"Extended"
},
{
FF_PROFILE_H264_HIGH
,
"High"
},
{
FF_PROFILE_H264_HIGH_10
,
"High 10"
},
{
FF_PROFILE_H264_HIGH_10_INTRA
,
"High 10 Intra"
},
{
FF_PROFILE_H264_HIGH_422
,
"High 4:2:2"
},
{
FF_PROFILE_H264_HIGH_422_INTRA
,
"High 4:2:2 Intra"
},
{
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_UNKNOWN
},
};
AVCodec
ff_h264_decoder
=
{
AVCodec
ff_h264_decoder
=
{
"h264"
,
"h264"
,
...
@@ -3399,6 +3414,7 @@ AVCodec ff_h264_decoder = {
...
@@ -3399,6 +3414,7 @@ AVCodec ff_h264_decoder = {
/*CODEC_CAP_DRAW_HORIZ_BAND |*/
CODEC_CAP_DR1
|
CODEC_CAP_DELAY
,
/*CODEC_CAP_DRAW_HORIZ_BAND |*/
CODEC_CAP_DR1
|
CODEC_CAP_DELAY
,
.
flush
=
flush_dpb
,
.
flush
=
flush_dpb
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
.
profiles
=
NULL_IF_CONFIG_SMALL
(
profiles
),
};
};
#if CONFIG_H264_VDPAU_DECODER
#if CONFIG_H264_VDPAU_DECODER
...
@@ -3415,5 +3431,6 @@ AVCodec ff_h264_vdpau_decoder = {
...
@@ -3415,5 +3431,6 @@ AVCodec ff_h264_vdpau_decoder = {
.
flush
=
flush_dpb
,
.
flush
=
flush_dpb
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"
),
.
pix_fmts
=
(
const
enum
PixelFormat
[]){
PIX_FMT_VDPAU_H264
,
PIX_FMT_NONE
},
.
pix_fmts
=
(
const
enum
PixelFormat
[]){
PIX_FMT_VDPAU_H264
,
PIX_FMT_NONE
},
.
profiles
=
NULL_IF_CONFIG_SMALL
(
profiles
),
};
};
#endif
#endif
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