Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
472f9ed3
Commit
472f9ed3
authored
Aug 06, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.
parent
1985c2e7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
9 deletions
+0
-9
utils.c
libavcodec/utils.c
+0
-2
frame.c
libavutil/frame.c
+0
-2
frame.h
libavutil/frame.h
+0
-2
version.h
libavutil/version.h
+0
-3
No files found.
libavcodec/utils.c
View file @
472f9ed3
...
@@ -576,13 +576,11 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
...
@@ -576,13 +576,11 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
int
size
;
int
size
;
AVFrameSideData
*
frame_sd
;
AVFrameSideData
*
frame_sd
;
#if FF_API_AVFRAME_COLORSPACE
frame
->
color_primaries
=
avctx
->
color_primaries
;
frame
->
color_primaries
=
avctx
->
color_primaries
;
frame
->
color_trc
=
avctx
->
color_trc
;
frame
->
color_trc
=
avctx
->
color_trc
;
frame
->
colorspace
=
avctx
->
colorspace
;
frame
->
colorspace
=
avctx
->
colorspace
;
frame
->
color_range
=
avctx
->
color_range
;
frame
->
color_range
=
avctx
->
color_range
;
frame
->
chroma_location
=
avctx
->
chroma_sample_location
;
frame
->
chroma_location
=
avctx
->
chroma_sample_location
;
#endif
frame
->
reordered_opaque
=
avctx
->
reordered_opaque
;
frame
->
reordered_opaque
=
avctx
->
reordered_opaque
;
if
(
!
pkt
)
{
if
(
!
pkt
)
{
...
...
libavutil/frame.c
View file @
472f9ed3
...
@@ -38,13 +38,11 @@ static void get_frame_defaults(AVFrame *frame)
...
@@ -38,13 +38,11 @@ static void get_frame_defaults(AVFrame *frame)
frame
->
sample_aspect_ratio
=
(
AVRational
){
0
,
1
};
frame
->
sample_aspect_ratio
=
(
AVRational
){
0
,
1
};
frame
->
format
=
-
1
;
/* unknown */
frame
->
format
=
-
1
;
/* unknown */
frame
->
extended_data
=
frame
->
data
;
frame
->
extended_data
=
frame
->
data
;
#if FF_API_AVFRAME_COLORSPACE
frame
->
color_primaries
=
AVCOL_PRI_UNSPECIFIED
;
frame
->
color_primaries
=
AVCOL_PRI_UNSPECIFIED
;
frame
->
color_trc
=
AVCOL_TRC_UNSPECIFIED
;
frame
->
color_trc
=
AVCOL_TRC_UNSPECIFIED
;
frame
->
colorspace
=
AVCOL_SPC_UNSPECIFIED
;
frame
->
colorspace
=
AVCOL_SPC_UNSPECIFIED
;
frame
->
color_range
=
AVCOL_RANGE_UNSPECIFIED
;
frame
->
color_range
=
AVCOL_RANGE_UNSPECIFIED
;
frame
->
chroma_location
=
AVCHROMA_LOC_UNSPECIFIED
;
frame
->
chroma_location
=
AVCHROMA_LOC_UNSPECIFIED
;
#endif
}
}
static
void
free_side_data
(
AVFrameSideData
**
ptr_sd
)
static
void
free_side_data
(
AVFrameSideData
**
ptr_sd
)
...
...
libavutil/frame.h
View file @
472f9ed3
...
@@ -433,7 +433,6 @@ typedef struct AVFrame {
...
@@ -433,7 +433,6 @@ typedef struct AVFrame {
*/
*/
int
flags
;
int
flags
;
#if FF_API_AVFRAME_COLORSPACE
enum
AVColorRange
color_range
;
enum
AVColorRange
color_range
;
enum
AVColorPrimaries
color_primaries
;
enum
AVColorPrimaries
color_primaries
;
...
@@ -443,7 +442,6 @@ typedef struct AVFrame {
...
@@ -443,7 +442,6 @@ typedef struct AVFrame {
enum
AVColorSpace
colorspace
;
enum
AVColorSpace
colorspace
;
enum
AVChromaLocation
chroma_location
;
enum
AVChromaLocation
chroma_location
;
#endif
}
AVFrame
;
}
AVFrame
;
/**
/**
...
...
libavutil/version.h
View file @
472f9ed3
...
@@ -111,9 +111,6 @@
...
@@ -111,9 +111,6 @@
#ifndef FF_API_OPT_TYPE_METADATA
#ifndef FF_API_OPT_TYPE_METADATA
#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55)
#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#endif
#ifndef FF_API_AVFRAME_COLORSPACE
#define FF_API_AVFRAME_COLORSPACE (LIBAVUTIL_VERSION_MAJOR >= 54)
#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