mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

FFMS2: Even less enum forward declarations

Browse source 
Originally committed to SVN as r2850.
This commit is contained in:
Fredrik Mellbin 2009-04-25 09:09:14 +00:00
parent 6f6d1bdf3a
commit 8f7930e876
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/FFmpegSource2/ffavisynth.cpp
View file

@ -50,7 +50,7 @@ AvisynthVideoSource::AvisynthVideoSource(const char *SourceFile, int Track, Fram
} }
try { try {
InitOutputFormat(VP.VPixelFormat, Env); InitOutputFormat(static_cast<PixelFormat>(VP.VPixelFormat), Env);
} catch (AvisynthError &) { } catch (AvisynthError &) {
FFMS_DestroyVideoSource(VS); FFMS_DestroyVideoSource(VS);
throw; throw;

2
aegisub/FFmpegSource2/ffms.h
View file

@ -97,7 +97,7 @@ struct VideoProperties {
int FPSDenominator; int FPSDenominator;
int FPSNumerator; int FPSNumerator;
int NumFrames; int NumFrames;
enum PixelFormat VPixelFormat; int VPixelFormat;
int SARNum; int SARNum;
int SARDen; int SARDen;
int CropTop; int CropTop;

2
aegisub/FFmpegSource2/ffvideosource.cpp
View file

@ -154,7 +154,7 @@ int VideoBase::SetOutputFormat(int TargetFormats, int Width, int Height, char *E
if (SWS) { if (SWS) {
FinalFrame = avcodec_alloc_frame(); FinalFrame = avcodec_alloc_frame();
avpicture_alloc((AVPicture *)FinalFrame, VP.VPixelFormat, VP.Width, VP.Height); avpicture_alloc((AVPicture *)FinalFrame, static_cast<PixelFormat>(VP.VPixelFormat), VP.Width, VP.Height);
} else { } else {
FinalFrame = PPFrame; FinalFrame = PPFrame;
} }

4
aegisub/FFmpegSource2/utils.cpp
View file

@ -177,12 +177,12 @@ typedef struct BITMAPINFOHEADER {
uint32_t biClrImportant; uint32_t biClrImportant;
} BITMAPINFOHEADER; } BITMAPINFOHEADER;
#endif
#define MAKEFOURCC(ch0, ch1, ch2, ch3)\ #define MAKEFOURCC(ch0, ch1, ch2, ch3)\
((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) |\ ((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) |\
((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24 )) ((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24 ))
#endif
CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate) { CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate) {
/* Video Codecs */ /* Video Codecs */
if (!strcmp(Codec, "V_MS/VFW/FOURCC")) { if (!strcmp(Codec, "V_MS/VFW/FOURCC")) {