diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:45:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:47:01 +0100 |
| commit | d280d43c2666c5f5c0cd346234391cd9f4076e83 (patch) | |
| tree | 87e13b48ce78bacc58e607da9e24f61fe1c4a606 | |
| parent | cceb737936e69e851977e8471da37d6777ed5a20 (diff) | |
| parent | 592a04054e6423be5050efd2bceece48b10b9c1d (diff) | |
| download | ffmpeg-streaming-d280d43c2666c5f5c0cd346234391cd9f4076e83.zip ffmpeg-streaming-d280d43c2666c5f5c0cd346234391cd9f4076e83.tar.gz | |
Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'
* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Conflicts:
libavutil/pixdesc.c
See: c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/pixdesc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 41bbe5d..5316ba4 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1721,7 +1721,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 0, 1, 0, 7 }, /* B */ { 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] = { .name = "gbrap16le", @@ -1734,7 +1735,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* B */ { 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] = { .name = "gbrap16be", @@ -1747,7 +1749,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 1, 1, 1, 0, 15 }, /* B */ { 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] = { .name = "vdpau", |
