summaryrefslogtreecommitdiffstats
path: root/video/filter
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-14 10:03:04 +0200
committerwm4 <wm4@nowhere>2014-06-14 10:03:04 +0200
commita9538e17ad8b66112239fab1b63c88de745d2134 (patch)
tree8d0072bf9f678604833330dfd0184ad836daf261 /video/filter
parent6ab72f976035f094406584795f680d2de8761c2b (diff)
downloadmpv-a9538e17ad8b66112239fab1b63c88de745d2134.tar.bz2
mpv-a9538e17ad8b66112239fab1b63c88de745d2134.tar.xz
video: synchronize mpv rgb pixel format names with ffmpeg names
This affects packed RGB formats up to 16 bits per pixel. The old mplayer names used LSB-to-MSB order, while FFmpeg (and some other libraries) use MSB-to-LSB. Nothing should change with this commit, i.e. no bit order or endian bugs should be added or fixed. In some cases, the name stays the same, even though the byte order changes, e.g. RGB8->BGR8 and BGR8->RGB8, and this affects the user-visible names too; this might cause confusion.
Diffstat (limited to 'video/filter')
-rw-r--r--video/filter/vf_scale.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index f11fd58a65..0090eb775f 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -113,12 +113,12 @@ static const unsigned int outfmt_list[] = {
IMGFMT_GBRP,
IMGFMT_RGB48_LE,
IMGFMT_RGB48_BE,
- IMGFMT_BGR16,
- IMGFMT_RGB16,
- IMGFMT_BGR15,
- IMGFMT_RGB15,
- IMGFMT_BGR12,
- IMGFMT_RGB12,
+ IMGFMT_BGR565,
+ IMGFMT_RGB565,
+ IMGFMT_BGR555,
+ IMGFMT_RGB555,
+ IMGFMT_BGR444,
+ IMGFMT_RGB444,
IMGFMT_Y8,
IMGFMT_BGR8,
IMGFMT_RGB8,