iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

FFmpegSource2: add a missing fourcc & fix a matroska access violation 

Originally committed to SVN as r2311.
This commit is contained in:
Fredrik Mellbin 2008-09-03 19:22:34 +00:00
parent d8c8d47e4c
commit 1ffa0a95a1
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FFmpegSource2/ffvideosource.cpp
View File

@ -451,7 +451,6 @@ MatroskaVideoSource::MatroskaVideoSource(const char *SourceFile, int Track,
}
MatroskaVideoSource::~MatroskaVideoSource() {
free(Buffer);
mkv_Close(MF);
fclose(MC.ST.fp);
if (CodecContext)

1
FFmpegSource2/ffvideosource.h
View File

@ -81,7 +81,6 @@ private:
CompressedStream *CS;
MatroskaFile *MF;
char ErrorMessage[256];
uint8_t *Buffer;
MatroskaReaderContext MC;
int DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTime, char *ErrorMsg, unsigned MsgSize);

1
FFmpegSource2/utils.cpp
View File

@ -208,6 +208,7 @@ CodecID MatroskaToFFCodecID(TrackInfo *TI) {
case MAKEFOURCC('D', 'I', 'V', 'X'):
case MAKEFOURCC('D', 'X', '5', '0'):
case MAKEFOURCC('M', 'P', '4', 'V'):
case MAKEFOURCC('m', 'p', '4', 'v'): // This one may be my fault
case MAKEFOURCC('3', 'I', 'V', 'X'):
case MAKEFOURCC('W', 'V', '1', 'F'):
case MAKEFOURCC('F', 'M', 'P', '4'):