virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'

Browse Source 
* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
  pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:
	libavutil/pixdesc.c

See: c7c71f95f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-24 01:45:43 +01:00
commit d280d43c26
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/pixdesc.c
View File

@ -1721,7 +1721,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 1, 0, 1, 0, 7 }, /* B */ { 1, 0, 1, 0, 7 }, /* B */
{ 3, 0, 1, 0, 7 }, /* A */ { 3, 0, 1, 0, 7 }, /* A */
}, },
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
}, },
[AV_PIX_FMT_GBRAP16LE] = { [AV_PIX_FMT_GBRAP16LE] = {
.name = "gbrap16le", .name = "gbrap16le",
@ -1734,7 +1735,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 1, 1, 1, 0, 15 }, /* B */ { 1, 1, 1, 0, 15 }, /* B */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
}, },
[AV_PIX_FMT_GBRAP16BE] = { [AV_PIX_FMT_GBRAP16BE] = {
.name = "gbrap16be", .name = "gbrap16be",
@ -1747,7 +1749,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 1, 1, 1, 0, 15 }, /* B */ { 1, 1, 1, 0, 15 }, /* B */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
}, },
[AV_PIX_FMT_VDPAU] = { [AV_PIX_FMT_VDPAU] = {
.name = "vdpau", .name = "vdpau",