highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'

Browse Source 
* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
  pixdesc: Support pixelformat aliases

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-04 21:24:24 +02:00
commit 073c074447
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
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-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h 2014-08-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h
2014-08-04 - xxxxxxx - lavu 52.95.100 / 53.20.0 - frame.h 2014-08-04 - xxxxxxx - lavu 52.95.100 / 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.

5
libavutil/pixdesc.c
View File

@ -23,12 +23,12 @@
#include <string.h> #include <string.h>
#include "avassert.h" #include "avassert.h"
#include "avstring.h"
#include "common.h" #include "common.h"
#include "pixfmt.h" #include "pixfmt.h"
#include "pixdesc.h" #include "pixdesc.h"
#include "internal.h" #include "internal.h"
#include "intreadwrite.h" #include "intreadwrite.h"
#include "avstring.h"
#include "version.h" #include "version.h"
void av_read_image_line(uint16_t *dst, void av_read_image_line(uint16_t *dst,
@ -1887,7 +1887,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

@ -98,6 +98,11 @@ typedef struct AVPixFmtDescriptor {
* otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V. * otherwise 0 is luma, 1 is chroma-U and 2 is chroma-V.
*/ */
AVComponentDescriptor comp[4]; AVComponentDescriptor comp[4];
/**
* Alternative comma-separated names.
*/
const char *alias;
} AVPixFmtDescriptor; } AVPixFmtDescriptor;
/** /**

4
libavutil/version.h
View File

@ -56,8 +56,8 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 95 #define LIBAVUTIL_VERSION_MINOR 96
#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_MICRO 100
#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, \