TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Switch the video cursor to the new decoding API

Browse Source
This commit is contained in:
Sam Edwards 2018-03-31 03:35:59 -06:00
parent 8d36908556
commit bb6e0abeba
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/ffmpeg/ffmpegVideoCursor.cxx
View File

@ -903,7 +903,18 @@ decode_frame(int &finished) {
*/ */
void FfmpegVideoCursor:: void FfmpegVideoCursor::
do_decode_frame(int &finished) { do_decode_frame(int &finished) {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 37, 100)
// While the audio cursor has a really nice async loop for decoding, we
// don't really do that much with video since we're already delegated to
// another thread here. This is just to silence the deprecation warning
// on avcodec_decode_video2.
avcodec_send_packet(_video_ctx, _packet);
int ret = avcodec_receive_frame(_video_ctx, _frame);
finished = (ret == 0);
#else
avcodec_decode_video2(_video_ctx, _frame, &finished, _packet); avcodec_decode_video2(_video_ctx, _frame, &finished, _packet);
#endif
} }
/** /**