mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

attempt to be compatible with old ffmpegs.

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@424 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-04-20 20:56:52 +00:00
parent c44f577650
commit 259ffd79a1
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linphone/gtk-glade/main.c
View file

@ -740,6 +740,7 @@ static void linphone_gtk_init_status_icon(){
g_signal_connect(G_OBJECT(icon),"popup-menu",(GCallback)icon_popup_menu,NULL); g_signal_connect(G_OBJECT(icon),"popup-menu",(GCallback)icon_popup_menu,NULL);
title=linphone_gtk_get_ui_config("title",_("Linphone - a video internet phone")); title=linphone_gtk_get_ui_config("title",_("Linphone - a video internet phone"));
gtk_status_icon_set_tooltip(icon,title); gtk_status_icon_set_tooltip(icon,title);
gtk_status_icon_set_visible(icon,TRUE);
g_object_set_data(G_OBJECT(icon),"menu",menu); g_object_set_data(G_OBJECT(icon),"menu",menu);
g_object_weak_ref(G_OBJECT(icon),(GWeakNotify)gtk_widget_destroy,menu); g_object_weak_ref(G_OBJECT(icon),(GWeakNotify)gtk_widget_destroy,menu);
} }

15
linphone/mediastreamer2/src/ffmpeg-priv.h
View file

@ -45,4 +45,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# include "swscale.h" # include "swscale.h"
#endif #endif
#if LIBAVCODEC_VERSION_MAJOR <= 51
/*should work as long as nobody uses avformat.h*/
typedef struct AVPacket{
uint8_t *data;
int size;
}AVPacket;
static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr,
AVPacket *avpkt){
return avcodec_decode_video(avctx,picture, got_picture_ptr,avpkt->data,avpkt->size);
}
#endif
#endif /* FFMPEG_PRIV_H */ #endif /* FFMPEG_PRIV_H */