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

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

Browse source 
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
*/
extern "C" {
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
}
#include "mkv_wrap.h"
#include "lavc_file.h"
#include "audio_provider.h"

6
aegisub/video_provider_lavc.cpp
View file

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