aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2011-03-20 13:19:51 +1100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-21 12:49:57 +0100
commit60c68c0ab93e6ad7a2b3cda845050c1a9f4363b8 (patch)
tree503238a050eb5cd798d45ddf7944bb4236f0c38d
parent139313827c32a95884650b6aac8cddedabd3759f (diff)
downloadffmpeg-60c68c0ab93e6ad7a2b3cda845050c1a9f4363b8.tar.gz
Remove unused pixel format (PIX_FMT_UNUSED) and swap PIX_FMT_BGR48LE and PIX_FMT_BGR48BE enum order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/pixfmt.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 0fdcaf5ffc..69c6274489 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -133,9 +133,8 @@ enum PixelFormat {
PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
PIX_FMT_Y400A, ///< 8bit gray, 8bit alpha
- PIX_FMT_UNUSED,
- PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+ PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
};