diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2016-05-10 07:56:16 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2016-05-10 07:56:16 +0000 |
| commit | a67ad981a8bc56dbdc7e3515d1969448ec366378 (patch) | |
| tree | d81f31f7d8cc45ae4a3c12305d76e8b60dc70894 | |
| parent | 3a64a90187c7c11ce464cc3b66c2f9c7d2f4b639 (diff) | |
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
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); |