From 9e150d282de50af8904a93ac92f28c2fdd509459 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Sun, 19 Jul 2009 22:51:19 +0000 Subject: [PATCH] Cosmetics in the y4m video provider Originally committed to SVN as r3177. --- aegisub/src/video_provider_yuv4mpeg.cpp | 6 +++--- aegisub/src/video_provider_yuv4mpeg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aegisub/src/video_provider_yuv4mpeg.cpp b/aegisub/src/video_provider_yuv4mpeg.cpp index 63a1a5c02..339c6aeae 100644 --- a/aegisub/src/video_provider_yuv4mpeg.cpp +++ b/aegisub/src/video_provider_yuv4mpeg.cpp @@ -216,7 +216,7 @@ void YUV4MPEGVideoProvider::ParseFileHeader(const std::vector& tags) { int t_fps_num = -1; int t_fps_den = -1; Y4M_InterlacingMode t_imode = Y4M_ILACE_NOTSET; - Y4M_PixelFormat t_pixfmt = Y4M_PIXFMT_NONE; + Y4M_PixelFormat t_pixfmt = Y4M_PIXFMT_NONE; for (unsigned i = 1; i < tags.size(); i++) { wxString tag = _T(""); @@ -242,8 +242,8 @@ void YUV4MPEGVideoProvider::ParseFileHeader(const std::vector& tags) { else if (tags.at(i).StartsWith(_T("C"), &tag)) { // technically this should probably be case sensitive, // but being liberal in what you accept doesn't hurt - if (!tag.CmpNoCase(_T("420jpeg"))) t_pixfmt = Y4M_PIXFMT_420JPEG; - else if (!tag.CmpNoCase(_T("420"))) t_pixfmt = Y4M_PIXFMT_420JPEG; // is this really correct? + if (!tag.CmpNoCase(_T("420"))) t_pixfmt = Y4M_PIXFMT_420JPEG; // is this really correct? + else if (!tag.CmpNoCase(_T("420jpeg"))) t_pixfmt = Y4M_PIXFMT_420JPEG; else if (!tag.CmpNoCase(_T("420mpeg2"))) t_pixfmt = Y4M_PIXFMT_420MPEG2; else if (!tag.CmpNoCase(_T("420paldv"))) t_pixfmt = Y4M_PIXFMT_420PALDV; else if (!tag.CmpNoCase(_T("411"))) t_pixfmt = Y4M_PIXFMT_411; diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h index 45fbc6651..91f61763b 100644 --- a/aegisub/src/video_provider_yuv4mpeg.h +++ b/aegisub/src/video_provider_yuv4mpeg.h @@ -51,9 +51,9 @@ class YUV4MPEGVideoProvider : public VideoProvider { private: enum Y4M_PixelFormat { Y4M_PIXFMT_NONE = -1, - Y4M_PIXFMT_420JPEG, - Y4M_PIXFMT_420MPEG2, - Y4M_PIXFMT_420PALDV, + Y4M_PIXFMT_420JPEG, // afaict the only difference between + Y4M_PIXFMT_420MPEG2, // these three is the chroma sample location, + Y4M_PIXFMT_420PALDV, // and nobody cares about that. Y4M_PIXFMT_411, Y4M_PIXFMT_422, Y4M_PIXFMT_444,