RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ffmpeg compile issues?

This commit is contained in:
rdb 2013-09-16 08:45:57 +00:00
parent 48baa5c58e
commit 21def6e5cc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/ffmpeg/ffmpegAudioCursor.cxx
View File

@ -321,7 +321,9 @@ reload_buffer() {
memcpy(_buffer, _frame->data[0], bufsize);
}
}
#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52, 19, 100)
av_frame_unref(_frame);
#endif
#endif
if (len < 0) {

2
panda/src/ffmpeg/ffmpegVirtualFile.cxx
View File

@ -188,7 +188,7 @@ open_subfile(const SubfileInfo &info) {
void FfmpegVirtualFile::
close() {
if (_format_context != NULL) {
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 25, 0)
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
avformat_close_input(&_format_context);
#else
av_close_input_file(_format_context);