diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-25 23:12:25 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-25 23:12:57 +0200 |
| commit | 84b2c79c56339eae64d5e5f622d8e65f463e5e1f (patch) | |
| tree | 18740b0864e0babe019d5c01ab1aa37f8723eced /libmpcodecs/vf_scale.c | |
| parent | bf3f28f0a8c8c532715050a89a952ae476a341d1 (diff) | |
| download | mpv-84b2c79c56339eae64d5e5f622d8e65f463e5e1f.tar.bz2 mpv-84b2c79c56339eae64d5e5f622d8e65f463e5e1f.tar.xz | |
libmpcodecs: rename IMGFMT_GBR24P to IMGFMT_GBRP
This is more in line with the ffmpeg/libav names.
Diffstat (limited to 'libmpcodecs/vf_scale.c')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index bfae494c05..4ccef63054 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -107,7 +107,7 @@ static const unsigned int outfmt_list[]={ IMGFMT_RGB32, IMGFMT_BGR24, IMGFMT_RGB24, - IMGFMT_GBR24P, + IMGFMT_GBRP, IMGFMT_RGB48LE, IMGFMT_RGB48BE, IMGFMT_BGR16, @@ -142,10 +142,10 @@ static int preferred_conversions[][2] = { {IMGFMT_UYVY, IMGFMT_422P}, {IMGFMT_422P, IMGFMT_YUY2}, {IMGFMT_422P, IMGFMT_UYVY}, - {IMGFMT_GBR24P, IMGFMT_BGR24}, - {IMGFMT_GBR24P, IMGFMT_RGB24}, - {IMGFMT_GBR24P, IMGFMT_BGR32}, - {IMGFMT_GBR24P, IMGFMT_RGB32}, + {IMGFMT_GBRP, IMGFMT_BGR24}, + {IMGFMT_GBRP, IMGFMT_RGB24}, + {IMGFMT_GBRP, IMGFMT_BGR32}, + {IMGFMT_GBRP, IMGFMT_RGB32}, {0, 0} }; |