From a67ad981a8bc56dbdc7e3515d1969448ec366378 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 10 May 2016 07:56:16 +0000 Subject: Re #1897: Updated ffmpeg_vid_codecs.c to support older ffmpeg. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5286 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c index ede85025..1f02cde8 100644 --- a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c +++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c @@ -1429,8 +1429,12 @@ static pj_status_t ffmpeg_codec_encode_whole(pjmedia_vid_codec *codec, /* Check if encoder has been opened */ PJ_ASSERT_RETURN(ff->enc_ctx, PJ_EINVALIDOP); +#ifdef PJMEDIA_USE_OLD_FFMPEG + avcodec_get_frame_defaults(&avframe); +#else pj_bzero(&avframe, sizeof(avframe)); av_frame_unref(&avframe); +#endif // Let ffmpeg manage the timestamps /* @@ -1680,8 +1684,12 @@ static pj_status_t ffmpeg_codec_decode_whole(pjmedia_vid_codec *codec, * whole decoding session, and seems to be freed when the codec context * closed). */ +#ifdef PJMEDIA_USE_OLD_FFMPEG + avcodec_get_frame_defaults(&avframe); +#else pj_bzero(&avframe, sizeof(avframe)); av_frame_unref(&avframe); +#endif /* Init packet, the container of the encoded data */ av_init_packet(&avpacket); -- cgit v1.2.3