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

Some fixes for ffmpeg linking (I have no idea how it worked before) 

Originally committed to SVN as r1473.
This commit is contained in:
Rodrigo Braz Monteiro 2007-08-07 22:10:44 +00:00
parent 2c60df7b53
commit b773706f6d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/audio_provider_lavc.cpp
View File

@ -49,8 +49,10 @@
* - done in posix/defines.h * - done in posix/defines.h
*/ */
extern "C" {
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
}
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"
#include "audio_provider.h" #include "audio_provider.h"

6
aegisub/video_provider_lavc.cpp
View File

@ -39,8 +39,10 @@
#ifdef WIN32 #ifdef WIN32
#define EMULATE_INTTYPES #define EMULATE_INTTYPES
#endif #endif
extern "C" {
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
}
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include <wx/image.h> #include <wx/image.h>
#include <algorithm> #include <algorithm>
@ -55,7 +57,7 @@
///////////////////// /////////////////////
// Link to libraries // Link to libraries
#if __VISUALC__ >= 1200 #if __VISUALC__ >= 1200
#pragma comment(lib, "swscale-0.lib") //#pragma comment(lib, "swscale-0.lib")
#pragma comment(lib, "avcodec-51.lib") #pragma comment(lib, "avcodec-51.lib")
#pragma comment(lib, "avformat-51.lib") #pragma comment(lib, "avformat-51.lib")
#pragma comment(lib, "avutil-49.lib") #pragma comment(lib, "avutil-49.lib")
@ -238,7 +240,7 @@ void LAVCVideoProvider::Close() {
buffer2Size = 0; buffer2Size = 0;
// Clean frame // Clean frame
if (frame) av_free(frame); if (frame) av_free((void*)frame);
frame = NULL; frame = NULL;
// Close codec context // Close codec context