From b782f20e916f664ed9f18b2191377159fffb1b07 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sat, 21 Dec 2013 16:33:19 +0000 Subject: cosmetics. no code change. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3039 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-1.2/libavutil/log.pas | 2 -- src/lib/ffmpeg-1.2/libavutil/pixfmt.pas | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/ffmpeg-1.2/libavutil') diff --git a/src/lib/ffmpeg-1.2/libavutil/log.pas b/src/lib/ffmpeg-1.2/libavutil/log.pas index 5adb0ec8..39ad09c8 100644 --- a/src/lib/ffmpeg-1.2/libavutil/log.pas +++ b/src/lib/ffmpeg-1.2/libavutil/log.pas @@ -128,8 +128,6 @@ type AV_CLASS_CATEGORY_NB ///< not part of ABI/API ); -type - // struct AVOptionRanges; (** diff --git a/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas b/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas index 8e1c87d4..da126bea 100644 --- a/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-1.2/libavutil/pixfmt.pas @@ -175,11 +175,11 @@ type AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian - {** + (** * duplicated pixel formats for compatibility with libav. * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55) * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85) - *} + *) AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) -- cgit v1.2.3