aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--xinebrowser.c3
-rw-r--r--xinebrowser_callbacks.c4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73455f1..2301185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-20 mallum,,, <mallum@openedhand.com>
+
+ * xinebrowser.c: (xinebrowser_win_open):
+ * xinebrowser_callbacks.c: (xinebrowser_movie_open_cb):
+ Patch via Terry Barnaby.
+ Support mp4, fix aspect ration, support >2GB files
+
2004-01-18 Matthew Allum <mallum@breakfast@10.am>
* Added support for simple playlists
diff --git a/xinebrowser.c b/xinebrowser.c
index 4f033c4..78060d1 100644
--- a/xinebrowser.c
+++ b/xinebrowser.c
@@ -231,7 +231,8 @@ xinebrowser_win_open (MBDesktop *mb, BrowserData *data, Bool force_shm)
vis.dest_size_cb = dest_size_cb;
vis.frame_output_cb = frame_output_cb;
vis.user_data = (void *)data;
- data->pixel_aspect = res_v / res_h;
+ data->pixel_aspect = (double)res_v / res_h;
+
/* Assume we get fullscreen */
data->width = DisplayWidth(display, screen);
diff --git a/xinebrowser_callbacks.c b/xinebrowser_callbacks.c
index 50fa368..df3b786 100644
--- a/xinebrowser_callbacks.c
+++ b/xinebrowser_callbacks.c
@@ -13,6 +13,8 @@
GNU General Public License for more details.
*/
+#define _FILE_OFFSET_BITS 64
+
#include "xinebrowser.h"
static void
@@ -243,7 +245,7 @@ xinebrowser_movie_open_cb (void *data1, void *data2)
if (mbdesktop_item_folder_has_contents(mb, item_folder))
mbdesktop_item_folder_contents_free(mb, item_folder);
- if (regcomp(&re, ".*(avi|mpg|mpeg|wmv|asf|mov)$",
+ if (regcomp(&re, ".*(avi|mpg|mpeg|wmv|asf|mov|mp4)$",
REG_EXTENDED|REG_ICASE|REG_NOSUB) != 0)
{
fprintf(stderr, "mbdesktop-filebrowser: failed to compile regexp\n");