Changeset 421:85f523efd7f7 in mediastreamer2

Timestamp:

Apr 20, 2009 10:56:52 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

attempt to be compatible with old ffmpegs.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@424 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• gtk-glade/main.c (modified) (1 diff)
• mediastreamer2/src/ffmpeg-priv.h (modified) (1 diff)

linphone/gtk-glade/main.c

@@ -741 +741 @@
         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);

linphone/mediastreamer2/src/ffmpeg-priv.h

@@ -46 +46 @@
 #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 */