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.
This commit is contained in:
Amar Takhar 2009-09-26 23:05:47 +00:00
parent 8802e0ba3d
commit cf8b0ae97c
2 changed files with 4 additions and 4 deletions

View File

@ -69,8 +69,8 @@ FFLAVFVideo::FFLAVFVideo(const char *SourceFile, int Track, FFMS_Index *Index,
VP.RFFNumerator = CodecContext->time_base.den; VP.RFFNumerator = CodecContext->time_base.den;
VP.NumFrames = Frames.size(); VP.NumFrames = Frames.size();
VP.TopFieldFirst = DecodeFrame->top_field_first; VP.TopFieldFirst = DecodeFrame->top_field_first;
VP.ColorSpace = CodecContext->colorspace; // VP.ColorSpace = CodecContext->colorspace;
VP.ColorRange = CodecContext->color_range; // VP.ColorRange = CodecContext->color_range;
VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; 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; VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;

View File

@ -96,8 +96,8 @@ FFMatroskaVideo::FFMatroskaVideo(const char *SourceFile, int Track,
VP.RFFNumerator = CodecContext->time_base.den; VP.RFFNumerator = CodecContext->time_base.den;
VP.NumFrames = Frames.size(); VP.NumFrames = Frames.size();
VP.TopFieldFirst = DecodeFrame->top_field_first; VP.TopFieldFirst = DecodeFrame->top_field_first;
VP.ColorSpace = CodecContext->colorspace; // VP.ColorSpace = CodecContext->colorspace;
VP.ColorRange = CodecContext->color_range; // VP.ColorRange = CodecContext->color_range;
VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000; 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; VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;