From c59339cb5815f0da364ed7e782b0e466a5290c84 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Sat, 15 Sep 2012 00:07:41 +0000 Subject: update some ffmpeg deprecated functions svn path=/trunk/externals/pdvjtools/; revision=16233 --- videogrid/videogrid.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/videogrid/videogrid.cc b/videogrid/videogrid.cc index bda1dcd..273ab79 100644 --- a/videogrid/videogrid.cc +++ b/videogrid/videogrid.cc @@ -155,7 +155,8 @@ extern "C" // Find the first video stream videoStream=-1; for(i=0; inb_streams; i++) - if(pFormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) + //if(pFormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) + if(pFormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) { videoStream=i; break; @@ -204,8 +205,8 @@ extern "C" if(packet.stream_index==videoStream) { // Decode video frame - avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, packet.data, packet.size); - + //avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, packet.data, packet.size); + avcodec_decode_video2(pCodecCtx, pFrame, &frameFinished, &packet); // Did we get a video frame? if(frameFinished) { @@ -237,8 +238,9 @@ extern "C" if(packet.stream_index==videoStream) { // Decode video frame - avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, - packet.data, packet.size); + //avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, packet.data, packet.size); + avcodec_decode_video2(pCodecCtx, pFrame, &frameFinished, &packet); + // Did we get a video frame? if(frameFinished) -- cgit v1.2.1