diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/src/main.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am index 42d5d7f78..aec38fcfe 100644 --- a/gtk/src/Makefile.am +++ b/gtk/src/Makefile.am @@ -2,13 +2,13 @@ if MINGW HB_LIBS= \ - -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \ + -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -lavcore -ldca -ldvdnav -ldvdread \ -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \ -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \ -lbz2 -liberty -lpthreadGC2 -lbluray else HB_LIBS= \ - -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \ + -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -lavcore -ldca -ldvdnav -ldvdread \ -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \ -lx264 -lmp4v2 -lswscale -ltheora -lfaad -lz \ -lbz2 -lpthread -lbluray diff --git a/gtk/src/main.c b/gtk/src/main.c index 7e62d6099..4fde5d69d 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -716,10 +716,6 @@ watch_volumes(signal_user_data_t *ud) #endif } -// Hack to avoid a segfault in libavcodec -extern int mm_flags; -int mm_support(); - G_MODULE_EXPORT void x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud); void preview_window_expose_cb(void); @@ -765,7 +761,6 @@ main (int argc, char *argv[]) GError *error = NULL; GOptionContext *context; - mm_flags = mm_support(); #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |