aballier 14/03/09 13:07:51 Added: pjsip-2.1-codecid.patch Log: fix build with ffmpeg2, bug #498454 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.1 net-libs/pjsip/files/pjsip-2.1-codecid.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pjsip/files/pjsip-2.1-codecid.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/pjsip/files/pjsip-2.1-codecid.patch?rev=1.1&content-type=text/plain Index: pjsip-2.1-codecid.patch =================================================================== Index: pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.c =================================================================== --- pjproject-2.1.0.orig/pjmedia/src/pjmedia/ffmpeg_util.c +++ pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.c @@ -62,7 +62,7 @@ static const struct ffmpeg_fmt_table_t static const struct ffmpeg_codec_table_t { pjmedia_format_id id; - enum CodecID codec_id; + enum AVCodecID codec_id; } ffmpeg_codec_table[] = { {PJMEDIA_FORMAT_H261, CODEC_ID_H261}, @@ -165,7 +165,7 @@ pj_status_t PixelFormat_to_pjmedia_forma } pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id, - enum CodecID *codec_id) + enum AVCodecID *codec_id) { unsigned i; for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) { @@ -180,7 +180,7 @@ pj_status_t pjmedia_format_id_to_CodecID return PJ_ENOTFOUND; } -pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id, +pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id, pjmedia_format_id *fmt_id) { unsigned i; Index: pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.h =================================================================== --- pjproject-2.1.0.orig/pjmedia/src/pjmedia/ffmpeg_util.h +++ pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.h @@ -51,9 +51,9 @@ pj_status_t PixelFormat_to_pjmedia_forma pjmedia_format_id *fmt_id); pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id, - enum CodecID *codec_id); + enum AVCodecID *codec_id); -pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id, +pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id, pjmedia_format_id *fmt_id); #endif /* __PJMEDIA_FFMPEG_UTIL_H__ */
