generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pixdesc: Support pixelformat aliases

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Luca Barbato 2014-07-24 23:17:17 +02:00 committed by Vittorio Giovara
parent 5420099cab
commit d2962e9f89
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -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.

4
libavutil/pixdesc.c
View File

@ -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)
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;

5
libavutil/pixdesc.h
View File

@ -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;
/** /**

4
libavutil/version.h
View File

@ -54,8 +54,8 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 53 #define LIBAVUTIL_VERSION_MAJOR 53
#define LIBAVUTIL_VERSION_MINOR 20 #define LIBAVUTIL_VERSION_MINOR 21
#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, \