Merge lp://qastaging/~noskcaj/ubuntu/trusty/handbrake/0.9.9 into lp://qastaging/ubuntu/trusty/handbrake
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/handbrake/0.9.9 |
Merge into: | lp://qastaging/ubuntu/trusty/handbrake |
Diff against target: |
45480 lines (+1781/-40760) 150 files modified
.gitignore (+0/-1) .pc/0003-Remove-embedded-downloaded-copies-of-various-librari.patch/make/include/main.defs (+0/-117) .pc/0003-Remove-embedded-downloaded-copies-of-various-librari.patch/test/module.defs (+0/-54) .pc/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch/libhb/module.defs (+0/-148) .pc/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch/libhb/ports.h (+0/-116) .pc/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch/make/include/main.defs (+0/-108) .pc/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch/libhb/decmetadata.c (+0/-201) .pc/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch/libhb/muxmp4.c (+0/-1401) .pc/0010-Remove-FAAC-dependency.patch/gtk/configure.ac (+0/-222) .pc/0010-Remove-FAAC-dependency.patch/gtk/src/audiohandler.c (+0/-1287) .pc/0010-Remove-FAAC-dependency.patch/gtk/src/hb-backend.c (+0/-5618) .pc/0010-Remove-FAAC-dependency.patch/gtk/src/preset_xlat.c (+0/-627) .pc/0010-Remove-FAAC-dependency.patch/gtk/src/presets.c (+0/-4666) .pc/0010-Remove-FAAC-dependency.patch/libhb/common.c (+0/-3103) .pc/0010-Remove-FAAC-dependency.patch/libhb/common.h (+0/-1070) .pc/0010-Remove-FAAC-dependency.patch/libhb/encfaac.c (+0/-289) .pc/0010-Remove-FAAC-dependency.patch/libhb/hb.c (+0/-1907) .pc/0010-Remove-FAAC-dependency.patch/libhb/internal.h (+0/-474) .pc/0010-Remove-FAAC-dependency.patch/libhb/module.defs (+0/-150) .pc/0010-Remove-FAAC-dependency.patch/libhb/muxmkv.c (+0/-691) .pc/0010-Remove-FAAC-dependency.patch/libhb/work.c (+0/-1623) .pc/0010-Remove-FAAC-dependency.patch/test/module.defs (+0/-52) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/gtk/configure.ac (+0/-222) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/gtk/src/hb-backend.c (+0/-5614) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/gtk/src/internal_defaults.xml (+0/-422) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/gtk/src/presets.c (+0/-4664) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/libhb/decmetadata.c (+0/-201) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/libhb/muxcommon.c (+0/-546) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/libhb/muxmp4.c (+0/-1401) .pc/0011-First-try-at-removing-some-of-mp4v2.patch/test/module.defs (+0/-52) .pc/0014-Use-unpatched-a52.patch/libhb/deca52.c (+0/-546) .pc/0016-use-older-libmkv.patch/libhb/muxmkv.c (+0/-690) .pc/0017-fixup-libmkv.patch/libhb/muxmkv.c (+0/-689) .pc/applied-patches (+0/-8) CREDITS (+2/-1) NEWS (+720/-624) THANKS (+0/-2) debian/changelog (+32/-0) debian/clean (+1/-0) debian/control (+6/-6) debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch (+0/-27) debian/patches/0002-Fix-include-with-the-system-s-libav.patch (+0/-45) debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch (+2/-2) debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch (+0/-43) debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch (+0/-39) debian/patches/0009-Remove-forcing-PGS-subtitles-to-be-included.patch (+0/-52) debian/patches/0010-Remove-FAAC-dependency.patch (+6/-6) debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch (+2/-2) debian/patches/0013-format-security.patch (+0/-26) debian/patches/0014-Use-unpatched-a52.patch (+1/-1) debian/patches/0015-use-metadata-reading-from-libav.patch (+0/-202) debian/patches/0016-use-older-libmkv.patch (+6/-0) debian/patches/0018-Fix-compilation-with-gstreamer-1.patch (+11/-0) debian/patches/0019-Do-not-require-wget-or-curl.patch (+22/-0) debian/patches/series (+2/-2) doc/BUILD-Mac (+33/-35) doc/texi/Building.mingw.texi (+1/-1) doc/texi/Building.osx.texi (+14/-7) doc/texi/building/chapter.via.xcode.texi (+0/-5) gfx/icons/-Credits.md (+11/-0) gtk/configure.ac (+1/-1) gtk/src/audiohandler.c (+6/-1) gtk/src/callbacks.c (+7/-2) gtk/src/callbacks.h (+1/-1) gtk/src/hb-backend.c (+8/-3) gtk/src/internal_defaults.xml (+2/-2) gtk/src/preset_xlat.c (+1/-0) gtk/src/presets.c (+3/-1) gtk/src/preview.c (+2/-2) gtk/src/preview.h (+2/-0) libhb/audio_remap.c (+1/-1) libhb/audio_remap.h (+1/-1) libhb/audio_resample.c (+1/-1) libhb/audio_resample.h (+1/-1) libhb/batch.c (+1/-1) libhb/bd.c (+1/-1) libhb/bits.h (+1/-1) libhb/common.c (+10/-5) libhb/common.h (+10/-12) libhb/cropscale.c (+1/-1) libhb/deca52.c (+1/-4) libhb/decavcodec.c (+66/-29) libhb/declpcm.c (+1/-1) libhb/decmetadata.c (+12/-7) libhb/decmpeg2.c (+1/-1) libhb/decomb.c (+1/-1) libhb/decpgssub.c (+1/-1) libhb/decsrtsub.c (+37/-23) libhb/decssasub.c (+10/-9) libhb/dectx3gsub.c (+5/-5) libhb/decutf8sub.c (+18/-20) libhb/decvobsub.c (+1/-1) libhb/demuxmpeg.c (+1/-1) libhb/detelecine.c (+1/-1) libhb/dvd.c (+1/-1) libhb/dvd.h (+1/-1) libhb/dvdnav.c (+1/-1) libhb/eedi2.c (+1/-1) libhb/eedi2.h (+1/-1) libhb/encavcodec.c (+1/-1) libhb/encavcodecaudio.c (+6/-3) libhb/encfaac.c (+1/-3) libhb/enclame.c (+1/-1) libhb/enctheora.c (+1/-1) libhb/encvobsub.c (+1/-1) libhb/encvorbis.c (+1/-1) libhb/encx264.c (+1/-1) libhb/encx264.h (+1/-1) libhb/fifo.c (+1/-1) libhb/hb.c (+23/-16) libhb/hb.h (+4/-1) libhb/hb_dict.c (+1/-1) libhb/hb_dict.h (+1/-1) libhb/hbffmpeg.h (+1/-1) libhb/internal.h (+3/-4) libhb/lang.c (+1/-1) libhb/lang.h (+1/-1) libhb/mcdeint.h (+1/-1) libhb/module.defs (+2/-4) libhb/muxcommon.c (+3/-4) libhb/muxmkv.c (+5/-7) libhb/muxmp4.c (+51/-39) libhb/platform/macosx/encca_aac.c (+1/-1) libhb/ports.c (+63/-25) libhb/ports.h (+6/-6) libhb/reader.c (+1/-1) libhb/rendersub.c (+1/-1) libhb/rotate.c (+1/-1) libhb/scan.c (+4/-3) libhb/stream.c (+56/-78) libhb/sync.c (+51/-47) libhb/taskset.c (+1/-1) libhb/taskset.h (+1/-1) libhb/update.c (+1/-1) libhb/vfr.c (+1/-1) libhb/work.c (+21/-25) make/configure.py (+2/-2) make/include/main.defs (+14/-10) pkg/appcast.xml.m4 (+1/-1) pkg/linux/debian/control.raring (+30/-0) pkg/linux/debian/rules.raring (+85/-0) pkg/linux/module.defs (+10/-0) pkg/linux/module.rules (+28/-13) pkg/module.defs (+3/-2) pkg/module.rules (+6/-0) scripts/manicure.rb (+72/-23) test/module.defs (+4/-2) test/parsecsv.c (+6/-3) test/parsecsv.h (+6/-3) test/test.c (+99/-159) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/handbrake/0.9.9 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email:
|
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 6. By Jackson Doak
-
merge from debian
Thanks. Uploaded.
Can the change please be forwarded to Debian?