summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <jstebbins.hb@gmail.com>2012-07-11 20:10:20 +0000
committerjstebbins <jstebbins.hb@gmail.com>2012-07-11 20:10:20 +0000
commit8b91bcb733913afea795cfea6178372eee5b4abe (patch)
tree09b4bd5693f2c361861d803522d2340b6beab985 /gtk
parent7f1f338df87f6075e7edf0cd598523acaf0f82a1 (diff)
bump libav to libav-v0.8-2197-g1a068bf
Resolves several deprecated api's Eliminates several libav patches Eliminates our builtin downmix in favour of avresample Eliminate HB_INPUT_CH_LAYOUT_* and replace with AV_CH_LAYOUT_* Resolves 6.x and 7.0 input channel layout issues HB had Adds downmix support to declpcm. We never had it! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4825 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 9c1dbd2cd..da65bc926 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -2,15 +2,15 @@
if MINGW
HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
- -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
- -lx264 -lmp4v2 -lswscale -ltheora -lz \
+ -lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldca \
+ -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc \
+ -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheora -lz \
-lbz2 -liberty -lpthreadGC2 -lbluray -lass -lfontconfig -lfreetype
else
HB_LIBS= \
- -lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
- -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
- -lx264 -lmp4v2 -lswscale -ltheora -lz \
+ -lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldca \
+ -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc \
+ -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheora -lz \
-lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
endif