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
d2962e9f
Commit
d2962e9f
authored
Jul 24, 2014
by
Luca Barbato
Committed by
Vittorio Giovara
Aug 04, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pixdesc: Support pixelformat aliases
Signed-off-by:
Vittorio Giovara
<
vittorio.giovara@gmail.com
>
parent
5420099c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
APIchanges
doc/APIchanges
+3
-0
pixdesc.c
libavutil/pixdesc.c
+3
-1
pixdesc.h
libavutil/pixdesc.h
+5
-0
version.h
libavutil/version.h
+2
-2
No files found.
doc/APIchanges
View file @
d2962e9f
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
API changes, most recent first:
API changes, most recent first:
2014-08-xx - xxxxxxx - lavu 53.21.0 - pixdesc.h
Support name aliases for pixel formats.
2014-08-xx - xxxxxxx - lavc 55.57.2 - avcodec.h
2014-08-xx - xxxxxxx - lavc 55.57.2 - avcodec.h
2014-08-xx - xxxxxxx - lavu 53.20.0 - frame.h
2014-08-xx - xxxxxxx - lavu 53.20.0 - frame.h
Deprecate AVCodecContext.dtg_active_format and use side-data instead.
Deprecate AVCodecContext.dtg_active_format and use side-data instead.
...
...
libavutil/pixdesc.c
View file @
d2962e9f
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <stdio.h>
#include <string.h>
#include <string.h>
#include "avstring.h"
#include "common.h"
#include "common.h"
#include "pixfmt.h"
#include "pixfmt.h"
#include "pixdesc.h"
#include "pixdesc.h"
...
@@ -1507,7 +1508,8 @@ static enum AVPixelFormat get_pix_fmt_internal(const char *name)
...
@@ -1507,7 +1508,8 @@ static enum AVPixelFormat get_pix_fmt_internal(const char *name)
for
(
pix_fmt
=
0
;
pix_fmt
<
AV_PIX_FMT_NB
;
pix_fmt
++
)
for
(
pix_fmt
=
0
;
pix_fmt
<
AV_PIX_FMT_NB
;
pix_fmt
++
)
if
(
av_pix_fmt_descriptors
[
pix_fmt
].
name
&&
if
(
av_pix_fmt_descriptors
[
pix_fmt
].
name
&&
!
strcmp
(
av_pix_fmt_descriptors
[
pix_fmt
].
name
,
name
))
(
!
strcmp
(
av_pix_fmt_descriptors
[
pix_fmt
].
name
,
name
)
||
av_match_name
(
name
,
av_pix_fmt_descriptors
[
pix_fmt
].
alias
)))
return
pix_fmt
;
return
pix_fmt
;
return
AV_PIX_FMT_NONE
;
return
AV_PIX_FMT_NONE
;
...
...
libavutil/pixdesc.h
View file @
d2962e9f
...
@@ -95,6 +95,11 @@ typedef struct AVPixFmtDescriptor {
...
@@ -95,6 +95,11 @@ typedef struct AVPixFmtDescriptor {
* comp[2].
* comp[2].
*/
*/
AVComponentDescriptor
comp
[
4
];
AVComponentDescriptor
comp
[
4
];
/**
* Alternative comma-separated names.
*/
const
char
*
alias
;
}
AVPixFmtDescriptor
;
}
AVPixFmtDescriptor
;
/**
/**
...
...
libavutil/version.h
View file @
d2962e9f
...
@@ -54,8 +54,8 @@
...
@@ -54,8 +54,8 @@
*/
*/
#define LIBAVUTIL_VERSION_MAJOR 53
#define LIBAVUTIL_VERSION_MAJOR 53
#define LIBAVUTIL_VERSION_MINOR 2
0
#define LIBAVUTIL_VERSION_MINOR 2
1
#define LIBAVUTIL_VERSION_MICRO
1
#define LIBAVUTIL_VERSION_MICRO
0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
LIBAVUTIL_VERSION_MINOR, \
...
...
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