diff options
| author | jstebbins <[email protected]> | 2010-09-14 16:38:12 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-09-14 16:38:12 +0000 |
| commit | 50a9b814396811fc33885d70d2798a6c8c1c595e (patch) | |
| tree | 7eee7df15967f65c5ad17e5f2ec33e886afc68ae /gtk/src | |
| parent | c1a82127fc2d99293cf27d3821d5ab85c93cc4ec (diff) | |
Bump ffmpeg from 22950 to 25082
It's been 5 months since an ffmpeg bump.
One negative is that we loose LATM support.
The LATM patch is just impossible to apply
anymore since ffmpeg dropped support for using
the external faad lib. There are ifdef's in the
code should anyone wish to revert to an earlier
ffmpeg and enable LATM.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3526 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -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"); |