From: Philip de N. <ph...@us...> - 2011-03-17 19:06:42
|
Update of /cvsroot/aaf/AAF/ref-impl/plugins In directory vz-cvs-4.sog:/tmp/cvs-serv3123/ref-impl/plugins Modified Files: CAAFCDCICodec.cpp Log Message: use ffmpeg avcodec_decode_video2 when avcodec_decode_video is deprecated Index: CAAFCDCICodec.cpp =================================================================== RCS file: /cvsroot/aaf/AAF/ref-impl/plugins/CAAFCDCICodec.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** CAAFCDCICodec.cpp 30 Nov 2009 13:10:16 -0000 1.38 --- CAAFCDCICodec.cpp 17 Mar 2011 19:06:40 -0000 1.39 *************** *** 1584,1590 **** // Decode one frame int dec_picture_ok = 0; ! int bytes_dec = avcodec_decode_video(_decoder->codec_context, _decoder->outputFrame, &dec_picture_ok, ! _decoder->inputBuffer, params->storedSize); ! if (bytes_dec <= 0 || !dec_picture_ok) { --- 1584,1601 ---- // Decode one frame int dec_picture_ok = 0; ! int bytes_dec; ! #if LIBAVCODEC_VERSION_INT >= ((52<<16)+(25<<8)+0) ! // avcodec_decode_video was deprecated in favour of avcodec_decode_video2 ! AVPacket packet; ! av_init_packet(&packet); ! packet.data = _decoder->inputBuffer; ! packet.size = params->storedSize; ! bytes_dec = avcodec_decode_video2(_decoder->codec_context, _decoder->outputFrame, &dec_picture_ok, ! &packet); ! #else ! bytes_dec = avcodec_decode_video(_decoder->codec_context, _decoder->outputFrame, &dec_picture_ok, ! _decoder->inputBuffer, params->storedSize); ! #endif ! if (bytes_dec <= 0 || !dec_picture_ok) { |