diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c index ac19a2d03..e11f0dc8b 100644 --- a/linphone/gtk-glade/main.c +++ b/linphone/gtk-glade/main.c @@ -740,6 +740,7 @@ static void linphone_gtk_init_status_icon(){ 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")); 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_weak_ref(G_OBJECT(icon),(GWeakNotify)gtk_widget_destroy,menu); } diff --git a/linphone/mediastreamer2/src/ffmpeg-priv.h b/linphone/mediastreamer2/src/ffmpeg-priv.h index eb5fcf471..3f6ca096b 100644 --- a/linphone/mediastreamer2/src/ffmpeg-priv.h +++ b/linphone/mediastreamer2/src/ffmpeg-priv.h @@ -45,4 +45,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # include "swscale.h" #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 */