From 21def6e5cc96920811dc7d9b80a3a77a548eea28 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 16 Sep 2013 08:45:57 +0000 Subject: [PATCH] fix ffmpeg compile issues? --- panda/src/ffmpeg/ffmpegAudioCursor.cxx | 2 ++ panda/src/ffmpeg/ffmpegVirtualFile.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/panda/src/ffmpeg/ffmpegAudioCursor.cxx b/panda/src/ffmpeg/ffmpegAudioCursor.cxx index 022337da60..603edfa4d5 100644 --- a/panda/src/ffmpeg/ffmpegAudioCursor.cxx +++ b/panda/src/ffmpeg/ffmpegAudioCursor.cxx @@ -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) { diff --git a/panda/src/ffmpeg/ffmpegVirtualFile.cxx b/panda/src/ffmpeg/ffmpegVirtualFile.cxx index e4be57b2ef..098a5ef471 100644 --- a/panda/src/ffmpeg/ffmpegVirtualFile.cxx +++ b/panda/src/ffmpeg/ffmpegVirtualFile.cxx @@ -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);