From cf8b0ae97cf98d30819fa004eaa8190afbb75006 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sat, 26 Sep 2009 23:05:47 +0000 Subject: [PATCH] Comment out a couple of lines in src/core/matroskavideo.cpp and src/core/lavfvideo.cpp to get aegisub building again, thefluff is working on a proper fix. Originally committed to SVN as r3578. --- aegisub/libffms/src/core/lavfvideo.cpp | 4 ++-- aegisub/libffms/src/core/matroskavideo.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/libffms/src/core/lavfvideo.cpp b/aegisub/libffms/src/core/lavfvideo.cpp index ab0be9b63..b1f1cb693 100644 --- a/aegisub/libffms/src/core/lavfvideo.cpp +++ b/aegisub/libffms/src/core/lavfvideo.cpp @@ -69,8 +69,8 @@ FFLAVFVideo::FFLAVFVideo(const char *SourceFile, int Track, FFMS_Index *Index, VP.RFFNumerator = CodecContext->time_base.den; VP.NumFrames = Frames.size(); VP.TopFieldFirst = DecodeFrame->top_field_first; - VP.ColorSpace = CodecContext->colorspace; - VP.ColorRange = CodecContext->color_range; +// VP.ColorSpace = CodecContext->colorspace; +// VP.ColorRange = CodecContext->color_range; VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; diff --git a/aegisub/libffms/src/core/matroskavideo.cpp b/aegisub/libffms/src/core/matroskavideo.cpp index ede35a6a8..fd8e5f6a5 100644 --- a/aegisub/libffms/src/core/matroskavideo.cpp +++ b/aegisub/libffms/src/core/matroskavideo.cpp @@ -96,8 +96,8 @@ FFMatroskaVideo::FFMatroskaVideo(const char *SourceFile, int Track, VP.RFFNumerator = CodecContext->time_base.den; VP.NumFrames = Frames.size(); VP.TopFieldFirst = DecodeFrame->top_field_first; - VP.ColorSpace = CodecContext->colorspace; - VP.ColorRange = CodecContext->color_range; +// VP.ColorSpace = CodecContext->colorspace; +// VP.ColorRange = CodecContext->color_range; VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;