RUN: /usr/share/launchpad-buildd/slavebin/slave-prep ['slave-prep']
Forking launchpad-buildd slave process...
Kernel version: 2.6.24-30-xen #1 SMP Mon Jan 2 21:13:17 UTC 2012 x86_64
Buildd toolchain package versions: launchpad-buildd_110~0.IS.08.04 python-lpbuildd_110~0.IS.08.04 bzr-builder_0.7.2+bzr156-0ubuntu1~1.IS.8.04 bzr_2.4.0-0ubuntu2~11.IS.8.04.
Syncing the system clock with the buildd NTP service...
10 Feb 19:46:31 ntpdate[3401]: step time server 10.211.37.1 offset -153918.448800 sec
RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot ['unpack-chroot', '7687068254b8a8d0507b1ac290032896f0bc91cc', '/home/buildd/filecache-default/d07a71733518179e223854cc698007b6272c37c0']
Uncompressing the tarball...
Unpacking chroot for build 7687068254b8a8d0507b1ac290032896f0bc91cc
RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot ['mount-chroot', '7687068254b8a8d0507b1ac290032896f0bc91cc']
Mounting chroot for build 7687068254b8a8d0507b1ac290032896f0bc91cc
RUN: /usr/share/launchpad-buildd/slavebin/override-sources-list ['override-sources-list', '7687068254b8a8d0507b1ac290032896f0bc91cc', 'deb http://ppa.launchpad.net/ubuntustudio-nightly/ubuntustudio-nightly/ubuntu maverick main', 'deb http://ftpmaster.internal/ubuntu maverick main restricted universe multiverse', 'deb http://ftpmaster.internal/ubuntu maverick-security main restricted universe multiverse', 'deb http://ftpmaster.internal/ubuntu maverick-updates main restricted universe multiverse']
Overriding sources.list in build-7687068254b8a8d0507b1ac290032896f0bc91cc
RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot ['update-debian-chroot', '7687068254b8a8d0507b1ac290032896f0bc91cc', 'i386']
Updating debian chroot for build 7687068254b8a8d0507b1ac290032896f0bc91cc
Get:1 http://ftpmaster.internal maverick Release.gpg [198B]
Ign http://ftpmaster.internal/ubuntu/ maverick/main Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick/multiverse Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick/restricted Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick/universe Translation-en
Get:2 http://ftpmaster.internal maverick-security Release.gpg [198B]
Ign http://ftpmaster.internal/ubuntu/ maverick-security/main Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick-security/multiverse Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick-security/restricted Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick-security/universe Translation-en
Get:3 http://ftpmaster.internal maverick-updates Release.gpg [198B]
Ign http://ftpmaster.internal/ubuntu/ maverick-updates/main Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick-updates/multiverse Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick-updates/restricted Translation-en
Ign http://ftpmaster.internal/ubuntu/ maverick-updates/universe Translation-en
Get:4 http://ftpmaster.internal maverick Release [39.8kB]
Get:5 http://ftpmaster.internal maverick-security Release [39.8kB]
Get:6 http://ftpmaster.internal maverick-updates Release [39.8kB]
Get:7 http://ftpmaster.internal maverick/main i386 Packages [1492kB]
Get:8 http://ppa.launchpad.net maverick Release.gpg [316B]
Ign http://ppa.launchpad.net/ubuntustudio-nightly/ubuntustudio-nightly/ubuntu/ maverick/main Translation-en
Get:9 http://ppa.launchpad.net maverick Release [9784B]
Ign http://ppa.launchpad.net maverick Release
Get:10 http://ftpmaster.internal maverick/restricted i386 Packages [5992B]
Get:11 http://ftpmaster.internal maverick/universe i386 Packages [5791kB]
Get:12 http://ppa.launchpad.net maverick/main i386 Packages [4778B]
Get:13 http://ftpmaster.internal maverick/multiverse i386 Packages [183kB]
Get:14 http://ftpmaster.internal maverick-security/main i386 Packages [319kB]
Get:15 http://ftpmaster.internal maverick-security/restricted i386 Packages [14B]
Get:16 http://ftpmaster.internal maverick-security/universe i386 Packages [107kB]
Get:17 http://ftpmaster.internal maverick-security/multiverse i386 Packages [4013B]
Get:18 http://ftpmaster.internal maverick-updates/main i386 Packages [457kB]
Get:19 http://ftpmaster.internal maverick-updates/restricted i386 Packages [1797B]
Get:20 http://ftpmaster.internal maverick-updates/universe i386 Packages [191kB]
Get:21 http://ftpmaster.internal maverick-updates/multiverse i386 Packages [5446B]
Fetched 8692kB in 3s (2453kB/s)
Reading package lists...
W: GPG error: http://ppa.launchpad.net maverick Release: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY DF9D185E52E9D7E2
Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be upgraded:
  apt apt-transport-https bsdutils bzip2 ca-certificates dpkg dpkg-dev
  ifupdown initramfs-tools initramfs-tools-bin initscripts libblkid1
  libbz2-1.0 libc-bin libc-dev-bin libc6 libc6-dev libcurl3-gnutls libdbus-1-3
  libdpkg-perl libdrm-intel1 libdrm-nouveau1 libdrm-radeon1 libdrm2
  libglib2.0-0 libgssapi-krb5-2 libk5crypto3 libkrb5-3 libkrb5support0
  libldap-2.4-2 libpam-modules libpam-runtime libpam0g libplymouth2 libpng12-0
  libssl0.9.8 libudev0 libuuid1 linux-libc-dev login mount openssl passwd perl
  perl-base perl-modules plymouth python-minimal sysv-rc sysvinit-utils tar
  tzdata udev upstart util-linux
55 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
Need to get 33.8MB of archives.
After this operation, 2621kB disk space will be freed.
WARNING: The following packages cannot be authenticated!
  dpkg login mount perl-modules libc-dev-bin libc6-dev libc-bin libc6
  linux-libc-dev tzdata bzip2 libbz2-1.0 perl perl-base tar sysvinit-utils
  sysv-rc libpam0g libpam-modules passwd initscripts libdbus-1-3 libudev0
  ifupdown upstart util-linux bsdutils python-minimal apt libssl0.9.8 libuuid1
  libblkid1 libpam-runtime initramfs-tools initramfs-tools-bin libglib2.0-0
  udev libdrm2 libdrm-intel1 libdrm-nouveau1 libdrm-radeon1 plymouth
  libpng12-0 libplymouth2 openssl ca-certificates libk5crypto3
  libgssapi-krb5-2 libkrb5-3 libkrb5support0 libldap-2.4-2 libcurl3-gnutls
  apt-transport-https dpkg-dev libdpkg-perl
Authentication warning overridden.
Get:1 http://ftpmaster.internal/ubuntu/ maverick-security/main dpkg i386 1.15.8.4ubuntu3.1 [2073kB]
Get:2 http://ftpmaster.internal/ubuntu/ maverick-security/main login i386 1:4.1.4.2-1ubuntu3.2 [315kB]
Get:3 http://ftpmaster.internal/ubuntu/ maverick-updates/main mount i386 2.17.2-0ubuntu1.10.10.2 [174kB]
Get:4 http://ftpmaster.internal/ubuntu/ maverick-security/main perl-modules all 5.10.1-12ubuntu2.1 [3491kB]
Get:5 http://ftpmaster.internal/ubuntu/ maverick-updates/main libc-dev-bin i386 2.12.1-0ubuntu10.2 [218kB]
Get:6 http://ftpmaster.internal/ubuntu/ maverick-updates/main libc6-dev i386 2.12.1-0ubuntu10.2 [4910kB]
Get:7 http://ftpmaster.internal/ubuntu/ maverick-updates/main libc-bin i386 2.12.1-0ubuntu10.2 [739kB]
Get:8 http://ftpmaster.internal/ubuntu/ maverick-updates/main libc6 i386 2.12.1-0ubuntu10.2 [3814kB]
Get:9 http://ftpmaster.internal/ubuntu/ maverick-security/main linux-libc-dev i386 2.6.35-1032.64 [834kB]
Get:10 http://ftpmaster.internal/ubuntu/ maverick-updates/main tzdata all 2011n-0ubuntu0.10.10 [637kB]
Get:11 http://ftpmaster.internal/ubuntu/ maverick-security/main bzip2 i386 1.0.5-4ubuntu1.1 [47.3kB]
Get:12 http://ftpmaster.internal/ubuntu/ maverick-security/main libbz2-1.0 i386 1.0.5-4ubuntu1.1 [45.3kB]
Get:13 http://ftpmaster.internal/ubuntu/ maverick-security/main perl i386 5.10.1-12ubuntu2.1 [3762kB]
Get:14 http://ftpmaster.internal/ubuntu/ maverick-security/main perl-base i386 5.10.1-12ubuntu2.1 [971kB]
Get:15 http://ftpmaster.internal/ubuntu/ maverick-updates/main tar i386 1.23-2ubuntu2 [403kB]
Get:16 http://ftpmaster.internal/ubuntu/ maverick-updates/main sysvinit-utils i386 2.87dsf-4ubuntu19.2 [111kB]
Get:17 http://ftpmaster.internal/ubuntu/ maverick-updates/main sysv-rc all 2.87dsf-4ubuntu19.2 [79.7kB]
Get:18 http://ftpmaster.internal/ubuntu/ maverick-security/main libpam0g i386 1.1.1-4ubuntu2.4 [91.8kB]
Get:19 http://ftpmaster.internal/ubuntu/ maverick-security/main libpam-modules i386 1.1.1-4ubuntu2.4 [336kB]
Get:20 http://ftpmaster.internal/ubuntu/ maverick-security/main passwd i386 1:4.1.4.2-1ubuntu3.2 [875kB]
Get:21 http://ftpmaster.internal/ubuntu/ maverick-updates/main initscripts i386 2.87dsf-4ubuntu19.2 [74.4kB]
Get:22 http://ftpmaster.internal/ubuntu/ maverick-security/main libdbus-1-3 i386 1.4.0-0ubuntu1.3 [130kB]
Get:23 http://ftpmaster.internal/ubuntu/ maverick-updates/main libudev0 i386 162-2.2 [126kB]
Get:24 http://ftpmaster.internal/ubuntu/ maverick-security/main ifupdown i386 0.6.10ubuntu3.1 [57.5kB]
Get:25 http://ftpmaster.internal/ubuntu/ maverick-updates/main upstart i386 0.6.6-4 [190kB]
Get:26 http://ftpmaster.internal/ubuntu/ maverick-updates/main util-linux i386 2.17.2-0ubuntu1.10.10.2 [527kB]
Get:27 http://ftpmaster.internal/ubuntu/ maverick-updates/main bsdutils i386 1:2.17.2-0ubuntu1.10.10.2 [80.3kB]
Get:28 http://ftpmaster.internal/ubuntu/ maverick-updates/main python-minimal all 2.6.6-2ubuntu2 [35.7kB]
Get:29 http://ftpmaster.internal/ubuntu/ maverick-security/main apt i386 0.8.3ubuntu7.3 [2077kB]
Get:30 http://ftpmaster.internal/ubuntu/ maverick-security/main libssl0.9.8 i386 0.9.8o-1ubuntu4.4 [866kB]
Get:31 http://ftpmaster.internal/ubuntu/ maverick-updates/main libuuid1 i386 2.17.2-0ubuntu1.10.10.2 [61.7kB]
Get:32 http://ftpmaster.internal/ubuntu/ maverick-updates/main libblkid1 i386 2.17.2-0ubuntu1.10.10.2 [111kB]
Get:33 http://ftpmaster.internal/ubuntu/ maverick-security/main libpam-runtime all 1.1.1-4ubuntu2.4 [86.1kB]
Get:34 http://ftpmaster.internal/ubuntu/ maverick-updates/main initramfs-tools all 0.98.1ubuntu6.1 [106kB]
Get:35 http://ftpmaster.internal/ubuntu/ maverick-updates/main initramfs-tools-bin i386 0.98.1ubuntu6.1 [65.5kB]
Get:36 http://ftpmaster.internal/ubuntu/ maverick-updates/main libglib2.0-0 i386 2.26.1-0ubuntu1 [1381kB]
Get:37 http://ftpmaster.internal/ubuntu/ maverick-updates/main udev i386 162-2.2 [428kB]
Get:38 http://ftpmaster.internal/ubuntu/ maverick-updates/main libdrm2 i386 2.4.21-1ubuntu2.1 [30.7kB]
Get:39 http://ftpmaster.internal/ubuntu/ maverick-updates/main libdrm-intel1 i386 2.4.21-1ubuntu2.1 [31.4kB]
Get:40 http://ftpmaster.internal/ubuntu/ maverick-updates/main libdrm-nouveau1 i386 2.4.21-1ubuntu2.1 [21.4kB]
Get:41 http://ftpmaster.internal/ubuntu/ maverick-updates/main libdrm-radeon1 i386 2.4.21-1ubuntu2.1 [22.2kB]
Get:42 http://ftpmaster.internal/ubuntu/ maverick-updates/main plymouth i386 0.8.2-2ubuntu5.1 [113kB]
Get:43 http://ftpmaster.internal/ubuntu/ maverick-security/main libpng12-0 i386 1.2.44-1ubuntu0.1 [177kB]
Get:44 http://ftpmaster.internal/ubuntu/ maverick-updates/main libplymouth2 i386 0.8.2-2ubuntu5.1 [89.5kB]
Get:45 http://ftpmaster.internal/ubuntu/ maverick-security/main openssl i386 0.9.8o-1ubuntu4.4 [400kB]
Get:46 http://ftpmaster.internal/ubuntu/ maverick-security/main ca-certificates all 20090814ubuntu0.10.10.1 [146kB]
Get:47 http://ftpmaster.internal/ubuntu/ maverick-security/main libk5crypto3 i386 1.8.1+dfsg-5ubuntu0.8 [97.1kB]
Get:48 http://ftpmaster.internal/ubuntu/ maverick-security/main libgssapi-krb5-2 i386 1.8.1+dfsg-5ubuntu0.8 [121kB]
Get:49 http://ftpmaster.internal/ubuntu/ maverick-security/main libkrb5-3 i386 1.8.1+dfsg-5ubuntu0.8 [349kB]
Get:50 http://ftpmaster.internal/ubuntu/ maverick-security/main libkrb5support0 i386 1.8.1+dfsg-5ubuntu0.8 [43.5kB]
Get:51 http://ftpmaster.internal/ubuntu/ maverick-security/main libldap-2.4-2 i386 2.4.23-0ubuntu3.7 [200kB]
Get:52 http://ftpmaster.internal/ubuntu/ maverick-security/main libcurl3-gnutls i386 7.21.0-1ubuntu1.3 [260kB]
Get:53 http://ftpmaster.internal/ubuntu/ maverick-security/main apt-transport-https i386 0.8.3ubuntu7.3 [92.5kB]
Get:54 http://ftpmaster.internal/ubuntu/ maverick-security/main dpkg-dev all 1.15.8.4ubuntu3.1 [772kB]
Get:55 http://ftpmaster.internal/ubuntu/ maverick-security/main libdpkg-perl all 1.15.8.4ubuntu3.1 [505kB]
debconf: delaying package configuration, since apt-utils is not installed
Fetched 33.8MB in 1s (31.0MB/s)
(Reading database ... 13493 files and directories currently installed.)
Preparing to replace dpkg 1.15.8.4ubuntu3 (using .../dpkg_1.15.8.4ubuntu3.1_i386.deb) ...
Unpacking replacement dpkg ...
Setting up dpkg (1.15.8.4ubuntu3.1) ...
(Reading database ... 13493 files and directories currently installed.)
Preparing to replace login 1:4.1.4.2-1ubuntu3 (using .../login_1%3a4.1.4.2-1ubuntu3.2_i386.deb) ...
Unpacking replacement login ...
Setting up login (1:4.1.4.2-1ubuntu3.2) ...
(Reading database ... 13493 files and directories currently installed.)
Preparing to replace mount 2.17.2-0ubuntu1 (using .../mount_2.17.2-0ubuntu1.10.10.2_i386.deb) ...
Unpacking replacement mount ...
Setting up mount (2.17.2-0ubuntu1.10.10.2) ...
(Reading database ... 13493 files and directories currently installed.)
Preparing to replace perl-modules 5.10.1-12ubuntu2 (using .../perl-modules_5.10.1-12ubuntu2.1_all.deb) ...
Unpacking replacement perl-modules ...
Preparing to replace libc-dev-bin 2.12.1-0ubuntu6 (using .../libc-dev-bin_2.12.1-0ubuntu10.2_i386.deb) ...
Unpacking replacement libc-dev-bin ...
Preparing to replace libc6-dev 2.12.1-0ubuntu6 (using .../libc6-dev_2.12.1-0ubuntu10.2_i386.deb) ...
Unpacking replacement libc6-dev ...
Preparing to replace libc-bin 2.12.1-0ubuntu6 (using .../libc-bin_2.12.1-0ubuntu10.2_i386.deb) ...
Unpacking replacement libc-bin ...
Setting up libc-bin (2.12.1-0ubuntu10.2) ...
(Reading database ... 13493 files and directories currently installed.)
Preparing to replace libc6 2.12.1-0ubuntu6 (using .../libc6_2.12.1-0ubuntu10.2_i386.deb) ...
Unpacking replacement libc6 ...
Setting up libc6 (2.12.1-0ubuntu10.2) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13493 files and directories currently installed.)
Preparing to replace linux-libc-dev 2.6.35-1022.33 (using .../linux-libc-dev_2.6.35-1032.64_i386.deb) ...
Unpacking replacement linux-libc-dev ...
Preparing to replace tzdata 2010l-1 (using .../tzdata_2011n-0ubuntu0.10.10_all.deb) ...
Unpacking replacement tzdata ...
Setting up tzdata (2011n-0ubuntu0.10.10) ...

Current default time zone: 'Etc/UTC'
Local time is now:      Thu Feb  9 01:02:12 UTC 2012.
Universal Time is now:  Thu Feb  9 01:02:12 UTC 2012.
Run 'dpkg-reconfigure tzdata' if you wish to change it.

(Reading database ... 13514 files and directories currently installed.)
Preparing to replace bzip2 1.0.5-4ubuntu1 (using .../bzip2_1.0.5-4ubuntu1.1_i386.deb) ...
Unpacking replacement bzip2 ...
Preparing to replace libbz2-1.0 1.0.5-4ubuntu1 (using .../libbz2-1.0_1.0.5-4ubuntu1.1_i386.deb) ...
Unpacking replacement libbz2-1.0 ...
Setting up libbz2-1.0 (1.0.5-4ubuntu1.1) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace perl 5.10.1-12ubuntu2 (using .../perl_5.10.1-12ubuntu2.1_i386.deb) ...
Unpacking replacement perl ...
Preparing to replace perl-base 5.10.1-12ubuntu2 (using .../perl-base_5.10.1-12ubuntu2.1_i386.deb) ...
Unpacking replacement perl-base ...
Setting up perl-base (5.10.1-12ubuntu2.1) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace tar 1.23-2 (using .../tar_1.23-2ubuntu2_i386.deb) ...
Unpacking replacement tar ...
Setting up tar (1.23-2ubuntu2) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace sysvinit-utils 2.87dsf-4ubuntu18 (using .../sysvinit-utils_2.87dsf-4ubuntu19.2_i386.deb) ...
Unpacking replacement sysvinit-utils ...
Preparing to replace sysv-rc 2.87dsf-4ubuntu18 (using .../sysv-rc_2.87dsf-4ubuntu19.2_all.deb) ...
Unpacking replacement sysv-rc ...
Preparing to replace libpam0g 1.1.1-4ubuntu1 (using .../libpam0g_1.1.1-4ubuntu2.4_i386.deb) ...
Unpacking replacement libpam0g ...
Setting up libpam0g (1.1.1-4ubuntu2.4) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace libpam-modules 1.1.1-4ubuntu1 (using .../libpam-modules_1.1.1-4ubuntu2.4_i386.deb) ...
Unpacking replacement libpam-modules ...
Setting up libpam-modules (1.1.1-4ubuntu2.4) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace passwd 1:4.1.4.2-1ubuntu3 (using .../passwd_1%3a4.1.4.2-1ubuntu3.2_i386.deb) ...
Unpacking replacement passwd ...
Setting up passwd (1:4.1.4.2-1ubuntu3.2) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace initscripts 2.87dsf-4ubuntu18 (using .../initscripts_2.87dsf-4ubuntu19.2_i386.deb) ...
Unpacking replacement initscripts ...
Preparing to replace libdbus-1-3 1.4.0-0ubuntu1 (using .../libdbus-1-3_1.4.0-0ubuntu1.3_i386.deb) ...
Unpacking replacement libdbus-1-3 ...
Preparing to replace libudev0 162-2 (using .../libudev0_162-2.2_i386.deb) ...
Unpacking replacement libudev0 ...
Preparing to replace ifupdown 0.6.10ubuntu3 (using .../ifupdown_0.6.10ubuntu3.1_i386.deb) ...
Unpacking replacement ifupdown ...
Preparing to replace upstart 0.6.6-3 (using .../upstart_0.6.6-4_i386.deb) ...
Unpacking replacement upstart ...
Preparing to replace util-linux 2.17.2-0ubuntu1 (using .../util-linux_2.17.2-0ubuntu1.10.10.2_i386.deb) ...
Unpacking replacement util-linux ...
Setting up libdbus-1-3 (1.4.0-0ubuntu1.3) ...
Setting up libudev0 (162-2.2) ...
Setting up sysvinit-utils (2.87dsf-4ubuntu19.2) ...
Setting up sysv-rc (2.87dsf-4ubuntu19.2) ...
Setting up initscripts (2.87dsf-4ubuntu19.2) ...
Installing new version of config file /etc/init.d/sendsigs ...
Installing new version of config file /etc/init.d/umountroot ...
Setting up upstart (0.6.6-4) ...
Setting up util-linux (2.17.2-0ubuntu1.10.10.2) ...
Setting up ifupdown (0.6.10ubuntu3.1) ...
Installing new version of config file /etc/init/network-interface-security.conf ...
Installing new version of config file /etc/init/network-interface.conf ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace bsdutils 1:2.17.2-0ubuntu1 (using .../bsdutils_1%3a2.17.2-0ubuntu1.10.10.2_i386.deb) ...
Unpacking replacement bsdutils ...
Setting up bsdutils (1:2.17.2-0ubuntu1.10.10.2) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace python-minimal 2.6.6-2ubuntu1 (using .../python-minimal_2.6.6-2ubuntu2_all.deb) ...
Unpacking replacement python-minimal ...
Setting up python-minimal (2.6.6-2ubuntu2) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace apt 0.8.3ubuntu7 (using .../apt_0.8.3ubuntu7.3_i386.deb) ...
Unpacking replacement apt ...
Setting up apt (0.8.3ubuntu7.3) ...
gpg: key 437D05B5: "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>" not changed
gpg: key FBB75451: "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>" not changed
gpg: Total number processed: 2
gpg:              unchanged: 2
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace libssl0.9.8 0.9.8o-1ubuntu4 (using .../libssl0.9.8_0.9.8o-1ubuntu4.4_i386.deb) ...
Unpacking replacement libssl0.9.8 ...
Setting up libssl0.9.8 (0.9.8o-1ubuntu4.4) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace libuuid1 2.17.2-0ubuntu1 (using .../libuuid1_2.17.2-0ubuntu1.10.10.2_i386.deb) ...
Unpacking replacement libuuid1 ...
Setting up libuuid1 (2.17.2-0ubuntu1.10.10.2) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace libblkid1 2.17.2-0ubuntu1 (using .../libblkid1_2.17.2-0ubuntu1.10.10.2_i386.deb) ...
Unpacking replacement libblkid1 ...
Setting up libblkid1 (2.17.2-0ubuntu1.10.10.2) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace libpam-runtime 1.1.1-4ubuntu1 (using .../libpam-runtime_1.1.1-4ubuntu2.4_all.deb) ...
Unpacking replacement libpam-runtime ...
Setting up libpam-runtime (1.1.1-4ubuntu2.4) ...
(Reading database ... 13514 files and directories currently installed.)
Preparing to replace initramfs-tools 0.98.1ubuntu6 (using .../initramfs-tools_0.98.1ubuntu6.1_all.deb) ...
Unpacking replacement initramfs-tools ...
Preparing to replace initramfs-tools-bin 0.98.1ubuntu6 (using .../initramfs-tools-bin_0.98.1ubuntu6.1_i386.deb) ...
Unpacking replacement initramfs-tools-bin ...
Preparing to replace libglib2.0-0 2.26.0-0ubuntu1 (using .../libglib2.0-0_2.26.1-0ubuntu1_i386.deb) ...
Unpacking replacement libglib2.0-0 ...
Preparing to replace udev 162-2 (using .../archives/udev_162-2.2_i386.deb) ...
Adding 'local diversion of /sbin/udevadm to /sbin/udevadm.upgrade'
Unpacking replacement udev ...
Preparing to replace libdrm2 2.4.21-1ubuntu2 (using .../libdrm2_2.4.21-1ubuntu2.1_i386.deb) ...
Unpacking replacement libdrm2 ...
Preparing to replace libdrm-intel1 2.4.21-1ubuntu2 (using .../libdrm-intel1_2.4.21-1ubuntu2.1_i386.deb) ...
Unpacking replacement libdrm-intel1 ...
Preparing to replace libdrm-nouveau1 2.4.21-1ubuntu2 (using .../libdrm-nouveau1_2.4.21-1ubuntu2.1_i386.deb) ...
Unpacking replacement libdrm-nouveau1 ...
Preparing to replace libdrm-radeon1 2.4.21-1ubuntu2 (using .../libdrm-radeon1_2.4.21-1ubuntu2.1_i386.deb) ...
Unpacking replacement libdrm-radeon1 ...
Preparing to replace plymouth 0.8.2-2ubuntu5 (using .../plymouth_0.8.2-2ubuntu5.1_i386.deb) ...
Unpacking replacement plymouth ...
Preparing to replace libpng12-0 1.2.44-1 (using .../libpng12-0_1.2.44-1ubuntu0.1_i386.deb) ...
Unpacking replacement libpng12-0 ...
Preparing to replace libplymouth2 0.8.2-2ubuntu5 (using .../libplymouth2_0.8.2-2ubuntu5.1_i386.deb) ...
Unpacking replacement libplymouth2 ...
Preparing to replace openssl 0.9.8o-1ubuntu4 (using .../openssl_0.9.8o-1ubuntu4.4_i386.deb) ...
Unpacking replacement openssl ...
Preparing to replace ca-certificates 20090814 (using .../ca-certificates_20090814ubuntu0.10.10.1_all.deb) ...
Unpacking replacement ca-certificates ...
Preparing to replace libk5crypto3 1.8.1+dfsg-5 (using .../libk5crypto3_1.8.1+dfsg-5ubuntu0.8_i386.deb) ...
Unpacking replacement libk5crypto3 ...
Preparing to replace libgssapi-krb5-2 1.8.1+dfsg-5 (using .../libgssapi-krb5-2_1.8.1+dfsg-5ubuntu0.8_i386.deb) ...
Unpacking replacement libgssapi-krb5-2 ...
Preparing to replace libkrb5-3 1.8.1+dfsg-5 (using .../libkrb5-3_1.8.1+dfsg-5ubuntu0.8_i386.deb) ...
Unpacking replacement libkrb5-3 ...
Preparing to replace libkrb5support0 1.8.1+dfsg-5 (using .../libkrb5support0_1.8.1+dfsg-5ubuntu0.8_i386.deb) ...
Unpacking replacement libkrb5support0 ...
Preparing to replace libldap-2.4-2 2.4.23-0ubuntu3 (using .../libldap-2.4-2_2.4.23-0ubuntu3.7_i386.deb) ...
Unpacking replacement libldap-2.4-2 ...
Preparing to replace libcurl3-gnutls 7.21.0-1ubuntu1 (using .../libcurl3-gnutls_7.21.0-1ubuntu1.3_i386.deb) ...
Unpacking replacement libcurl3-gnutls ...
Preparing to replace apt-transport-https 0.8.3ubuntu7 (using .../apt-transport-https_0.8.3ubuntu7.3_i386.deb) ...
Unpacking replacement apt-transport-https ...
Preparing to replace dpkg-dev 1.15.8.4ubuntu3 (using .../dpkg-dev_1.15.8.4ubuntu3.1_all.deb) ...
Unpacking replacement dpkg-dev ...
Preparing to replace libdpkg-perl 1.15.8.4ubuntu3 (using .../libdpkg-perl_1.15.8.4ubuntu3.1_all.deb) ...
Unpacking replacement libdpkg-perl ...
Setting up libc-dev-bin (2.12.1-0ubuntu10.2) ...
Setting up linux-libc-dev (2.6.35-1032.64) ...
Setting up libc6-dev (2.12.1-0ubuntu10.2) ...
Setting up bzip2 (1.0.5-4ubuntu1.1) ...
Setting up initramfs-tools-bin (0.98.1ubuntu6.1) ...
Setting up libglib2.0-0 (2.26.1-0ubuntu1) ...
Setting up libdrm2 (2.4.21-1ubuntu2.1) ...
Setting up libdrm-intel1 (2.4.21-1ubuntu2.1) ...
Setting up libdrm-nouveau1 (2.4.21-1ubuntu2.1) ...
Setting up libdrm-radeon1 (2.4.21-1ubuntu2.1) ...
Setting up libpng12-0 (1.2.44-1ubuntu0.1) ...
Setting up libplymouth2 (0.8.2-2ubuntu5.1) ...
Setting up openssl (0.9.8o-1ubuntu4.4) ...
Setting up ca-certificates (20090814ubuntu0.10.10.1) ...
Updating certificates in /etc/ssl/certs... WARNING: Skipping duplicate certificate ca-certificates.crt
0 added, 1 removed; done.
Running hooks in /etc/ca-certificates/update.d....done.
Setting up libkrb5support0 (1.8.1+dfsg-5ubuntu0.8) ...
Setting up libk5crypto3 (1.8.1+dfsg-5ubuntu0.8) ...
Setting up libkrb5-3 (1.8.1+dfsg-5ubuntu0.8) ...
Setting up libgssapi-krb5-2 (1.8.1+dfsg-5ubuntu0.8) ...
Setting up libldap-2.4-2 (2.4.23-0ubuntu3.7) ...
Setting up libcurl3-gnutls (7.21.0-1ubuntu1.3) ...
Setting up apt-transport-https (0.8.3ubuntu7.3) ...
Setting up perl-modules (5.10.1-12ubuntu2.1) ...
Setting up perl (5.10.1-12ubuntu2.1) ...
Setting up udev (162-2.2) ...
Removing 'local diversion of /sbin/udevadm to /sbin/udevadm.upgrade'
update-initramfs: deferring update (trigger activated)
Setting up initramfs-tools (0.98.1ubuntu6.1) ...
update-initramfs: deferring update (trigger activated)
Setting up plymouth (0.8.2-2ubuntu5.1) ...
update-initramfs: deferring update (trigger activated)
Setting up libdpkg-perl (1.15.8.4ubuntu3.1) ...
Setting up dpkg-dev (1.15.8.4ubuntu3.1) ...
Processing triggers for libc-bin ...
ldconfig deferred processing now taking place
Processing triggers for initramfs-tools ...
RUN: /usr/share/launchpad-buildd/slavebin/buildrecipe ['buildrecipe', '7687068254b8a8d0507b1ac290032896f0bc91cc', 'Ubuntu Studio Nightly', 'ubuntustudio-nightly@lists.launchpad.net', 'maverick', 'maverick', 'universe', 'PPA']
Bazaar versions:
Bazaar (bzr) 2.4.0
  Python interpreter: /usr/bin/python 2.5.2
  Python standard library: /usr/lib/python2.5
  Platform: Linux-2.6.24-30-xen-x86_64-with-debian-lenny-sid
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/buildd/.bazaar
  Bazaar log file: /home/buildd/.bzr.log

Copyright 2005-2011 Canonical Ltd.
http://bazaar.canonical.com/

bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

Bazaar is part of the GNU Project to produce a free operating system.

bash_completion 2.4.0
  Generate a shell function for bash command line completion.

builder 0.7.2dev
  The bzr-builder plugin allows you to construct a branch from a 'recipe'.

changelog_merge 2.4.0
  Merge hook for GNU-format ChangeLog files

launchpad 2.4.0
  Launchpad.net integration plugin for Bazaar.

netrc_credential_store 2.4.0
  Use ~/.netrc as a credential store for authentication.conf.

news_merge 2.4.0
  Merge hook for bzr's NEWS file.

weave_fmt 2.4.0
  Weave formats.

Building recipe:
# bzr-builder format 0.2 deb-version 4:0.6+{revno}+{revno:swscale}-0ubuntu0+{revno:packaging}+{time}
lp:~rexbron/ffmpeg/trunk
merge packaging lp:~rexbron/ffmpeg/debian.nightly
nest swscale lp:libswscale libswscale

RUN ['bzr', '-Derror', 'dailydeb', '--safe', '--no-build', '/home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/home/buildd/work/recipe', '/home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/home/buildd/work/tree', '--manifest', '/home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/home/buildd/work/tree/manifest', '--distribution', 'maverick', '--allow-fallback-to-native', '--append-version', '~maverick1']
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data.  See "bzr help launchpad-login".
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data.  See "bzr help launchpad-login".
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data.  See "bzr help launchpad-login".
Building tree.
Retrieving 'lp:~rexbron/ffmpeg/trunk' to put at '/home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/home/buildd/work/tree/recipe-4:0.6+{revno}+{revno:swscale}-0ubuntu0+{revno:packaging}+201202090103'.
Merging 'lp:~rexbron/ffmpeg/debian.nightly' in to '/home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/home/buildd/work/tree/recipe-4:0.6+{revno}+{revno:swscale}-0ubuntu0+{revno:packaging}+201202090103'.
Text conflict in CREDITS
Text conflict in Changelog
Text conflict in Doxyfile
Text conflict in INSTALL
Text conflict in LICENSE
Text conflict in MAINTAINERS
Text conflict in Makefile
Text conflict in cmdutils.c
Text conflict in cmdutils.h
Text conflict in cmdutils_common_opts.h
Text conflict in common.mak
Text conflict in configure
Text conflict in doc/APIchanges
Text conflict in doc/avutil.txt
Text conflict in doc/developer.texi
Text conflict in doc/faq.texi
Text conflict in doc/filters.texi
Text conflict in doc/general.texi
Text conflict in doc/indevs.texi
Text conflict in doc/issue_tracker.txt
Text conflict in doc/libavfilter.texi
Text conflict in doc/optimization.txt
Text conflict in doc/outdevs.texi
Text conflict in doc/protocols.texi
Text conflict in doc/soc.txt
Text conflict in doc/texi2pod.pl
Text conflict in ffmpeg.c
Text conflict in ffplay.c
Text conflict in ffprobe.c
Text conflict in ffserver.c
Text conflict in libavcodec/4xm.c
Text conflict in libavcodec/8bps.c
Text conflict in libavcodec/8svx.c
Text conflict in libavcodec/Makefile
Text conflict in libavcodec/a64colors.h
Text conflict in libavcodec/a64enc.h
Text conflict in libavcodec/a64multienc.c
Text conflict in libavcodec/aac.h
Text conflict in libavcodec/aac_ac3_parser.c
Text conflict in libavcodec/aac_ac3_parser.h
Text conflict in libavcodec/aac_adtstoasc_bsf.c
Text conflict in libavcodec/aac_parser.c
Text conflict in libavcodec/aac_tablegen.h
Text conflict in libavcodec/aac_tablegen_decl.h
Text conflict in libavcodec/aacadtsdec.c
Text conflict in libavcodec/aacadtsdec.h
Text conflict in libavcodec/aaccoder.c
Text conflict in libavcodec/aacdec.c
Text conflict in libavcodec/aacdectab.h
Text conflict in libavcodec/aacenc.c
Text conflict in libavcodec/aacenc.h
Text conflict in libavcodec/aacps.c
Text conflict in libavcodec/aacps.h
Text conflict in libavcodec/aacps_tablegen.h
Text conflict in libavcodec/aacpsy.c
Text conflict in libavcodec/aacsbr.c
Text conflict in libavcodec/aacsbr.h
Text conflict in libavcodec/aacsbrdata.h
Text conflict in libavcodec/aasc.c
Text conflict in libavcodec/ac3.c
Text conflict in libavcodec/ac3.h
Text conflict in libavcodec/ac3_parser.c
Text conflict in libavcodec/ac3_parser.h
Text conflict in libavcodec/ac3dec.c
Text conflict in libavcodec/ac3dec.h
Text conflict in libavcodec/ac3dec_data.c
Text conflict in libavcodec/ac3dec_data.h
Text conflict in libavcodec/ac3enc.c
Text conflict in libavcodec/ac3tab.c
Text conflict in libavcodec/ac3tab.h
Text conflict in libavcodec/acelp_filters.c
Text conflict in libavcodec/acelp_filters.h
Text conflict in libavcodec/acelp_pitch_delay.c
Text conflict in libavcodec/acelp_pitch_delay.h
Text conflict in libavcodec/acelp_vectors.c
Text conflict in libavcodec/adpcm.c
Text conflict in libavcodec/adx.h
Text conflict in libavcodec/adxdec.c
Text conflict in libavcodec/adxenc.c
Text conflict in libavcodec/alac.c
Text conflict in libavcodec/alacenc.c
Text conflict in libavcodec/allcodecs.c
Text conflict in libavcodec/alpha/dsputil_alpha.c
Text conflict in libavcodec/alpha/simple_idct_alpha.c
Text conflict in libavcodec/alsdec.c
Text conflict in libavcodec/amrnbdata.h
Text conflict in libavcodec/amrnbdec.c
Text conflict in libavcodec/anm.c
Text conflict in libavcodec/ansi.c
Text conflict in libavcodec/apedec.c
Text conflict in libavcodec/arm/Makefile
Text conflict in libavcodec/arm/aac.h
Text conflict in libavcodec/arm/asm-offsets.h
Text conflict in libavcodec/arm/asm.S
Text conflict in libavcodec/arm/dcadsp_init_arm.c
Text conflict in libavcodec/arm/dcadsp_neon.S
Text conflict in libavcodec/arm/dsputil_arm.S
Text conflict in libavcodec/arm/dsputil_arm.h
Text conflict in libavcodec/arm/dsputil_armv6.S
Text conflict in libavcodec/arm/dsputil_init_arm.c
Text conflict in libavcodec/arm/dsputil_init_armv5te.c
Text conflict in libavcodec/arm/dsputil_init_armv6.c
Text conflict in libavcodec/arm/dsputil_init_neon.c
Text conflict in libavcodec/arm/dsputil_init_vfp.c
Text conflict in libavcodec/arm/dsputil_iwmmxt.c
Text conflict in libavcodec/arm/dsputil_neon.S
Text conflict in libavcodec/arm/dsputil_vfp.S
Text conflict in libavcodec/arm/fft_init_arm.c
Text conflict in libavcodec/arm/fft_neon.S
Text conflict in libavcodec/arm/h264dsp_init_arm.c
Text conflict in libavcodec/arm/h264dsp_neon.S
Text conflict in libavcodec/arm/h264idct_neon.S
Text conflict in libavcodec/arm/h264pred_init_arm.c
Text conflict in libavcodec/arm/h264pred_neon.S
Text conflict in libavcodec/arm/int_neon.S
Text conflict in libavcodec/arm/jrevdct_arm.S
Text conflict in libavcodec/arm/mathops.h
Text conflict in libavcodec/arm/mdct_neon.S
Text conflict in libavcodec/arm/mpegvideo_arm.h
Text conflict in libavcodec/arm/mpegvideo_armv5te_s.S
Text conflict in libavcodec/arm/mpegvideo_iwmmxt.c
Text conflict in libavcodec/arm/mpegvideo_neon.S
Text conflict in libavcodec/arm/rdft_neon.S
Text conflict in libavcodec/arm/simple_idct_arm.S
Text conflict in libavcodec/arm/simple_idct_armv5te.S
Text conflict in libavcodec/arm/simple_idct_armv6.S
Text conflict in libavcodec/arm/simple_idct_neon.S
Text conflict in libavcodec/arm/synth_filter_neon.S
Text conflict in libavcodec/arm/vp3dsp_neon.S
Text conflict in libavcodec/asv1.c
Text conflict in libavcodec/atrac.c
Text conflict in libavcodec/atrac.h
Text conflict in libavcodec/atrac1.c
Text conflict in libavcodec/atrac3.c
Text conflict in libavcodec/audioconvert.c
Text conflict in libavcodec/audioconvert.h
Text conflict in libavcodec/aura.c
Text conflict in libavcodec/avcodec.h
Text conflict in libavcodec/avfft.c
Text conflict in libavcodec/avpacket.c
Text conflict in libavcodec/avs.c
Text conflict in libavcodec/bethsoftvideo.c
Text conflict in libavcodec/bfi.c
Text conflict in libavcodec/bfin/dsputil_bfin.c
Text conflict in libavcodec/bfin/mathops.h
Text conflict in libavcodec/bfin/mpegvideo_bfin.c
Text conflict in libavcodec/bgmc.c
Text conflict in libavcodec/bgmc.h
Text conflict in libavcodec/bink.c
Text conflict in libavcodec/binkaudio.c
Text conflict in libavcodec/binkdata.h
Text conflict in libavcodec/bitstream.c
Text conflict in libavcodec/bmp.c
Text conflict in libavcodec/bmpenc.c
Text conflict in libavcodec/bytestream.h
Text conflict in libavcodec/c93.c
Text conflict in libavcodec/cabac.c
Text conflict in libavcodec/cabac.h
Text conflict in libavcodec/cavs.c
Text conflict in libavcodec/cavs.h
Text conflict in libavcodec/cavs_parser.c
Text conflict in libavcodec/cavsdata.h
Text conflict in libavcodec/cavsdec.c
Text conflict in libavcodec/cavsdsp.h
Text conflict in libavcodec/cbrt_tablegen.h
Text conflict in libavcodec/cdgraphics.c
Text conflict in libavcodec/celp_filters.c
Text conflict in libavcodec/celp_filters.h
Text conflict in libavcodec/celp_math.c
Text conflict in libavcodec/celp_math.h
Text conflict in libavcodec/cga_data.c
Text conflict in libavcodec/cga_data.h
Text conflict in libavcodec/chomp_bsf.c
Text conflict in libavcodec/cinepak.c
Text conflict in libavcodec/cljr.c
Text conflict in libavcodec/cook.c
Text conflict in libavcodec/cscd.c
Text conflict in libavcodec/cyuv.c
Text conflict in libavcodec/dca.c
Text conflict in libavcodec/dca_parser.c
Text conflict in libavcodec/dcadata.h
Text conflict in libavcodec/dcadsp.c
Text conflict in libavcodec/dcadsp.h
Text conflict in libavcodec/dct-test.c
Text conflict in libavcodec/dct.c
Text conflict in libavcodec/dct32.c
Text conflict in libavcodec/dctref.h
Text conflict in libavcodec/dirac.c
Text conflict in libavcodec/dirac.h
Text conflict in libavcodec/dirac_parser.c
Text conflict in libavcodec/dnxhd_parser.c
Text conflict in libavcodec/dnxhddata.c
Text conflict in libavcodec/dnxhddata.h
Text conflict in libavcodec/dnxhddec.c
Text conflict in libavcodec/dnxhdenc.c
Text conflict in libavcodec/dnxhdenc.h
Text conflict in libavcodec/dpcm.c
Text conflict in libavcodec/dpx.c
Text conflict in libavcodec/dsicinav.c
Text conflict in libavcodec/dsputil.c
Text conflict in libavcodec/dsputil.h
Text conflict in libavcodec/dump_extradata_bsf.c
Text conflict in libavcodec/dv.c
Text conflict in libavcodec/dv_tablegen.h
Text conflict in libavcodec/dvbsub.c
Text conflict in libavcodec/dvbsub_parser.c
Text conflict in libavcodec/dvbsubdec.c
Text conflict in libavcodec/dvdata.c
Text conflict in libavcodec/dvdata.h
Text conflict in libavcodec/dvdsub_parser.c
Text conflict in libavcodec/dvdsubdec.c
Text conflict in libavcodec/dvdsubenc.c
Text conflict in libavcodec/dwt.c
Text conflict in libavcodec/dwt.h
Text conflict in libavcodec/dxa.c
Text conflict in libavcodec/dxva2.c
Text conflict in libavcodec/dxva2.h
Text conflict in libavcodec/dxva2_h264.c
Text conflict in libavcodec/dxva2_internal.h
Text conflict in libavcodec/dxva2_mpeg2.c
Text conflict in libavcodec/dxva2_vc1.c
Text conflict in libavcodec/eac3dec.c
Text conflict in libavcodec/eacmv.c
Text conflict in libavcodec/eamad.c
Text conflict in libavcodec/eatgq.c
Text conflict in libavcodec/eatgv.c
Text conflict in libavcodec/eatqi.c
Text conflict in libavcodec/error_resilience.c
Text conflict in libavcodec/escape124.c
Text conflict in libavcodec/faxcompr.c
Text conflict in libavcodec/faxcompr.h
Text conflict in libavcodec/fft-test.c
Text conflict in libavcodec/fft.c
Text conflict in libavcodec/fft.h
Text conflict in libavcodec/ffv1.c
Text conflict in libavcodec/flac.c
Text conflict in libavcodec/flac.h
Text conflict in libavcodec/flacdec.c
Text conflict in libavcodec/flacenc.c
Text conflict in libavcodec/flashsv.c
Text conflict in libavcodec/flashsvenc.c
Text conflict in libavcodec/flicvideo.c
Text conflict in libavcodec/flv.h
Text conflict in libavcodec/flvdec.c
Text conflict in libavcodec/flvenc.c
Text conflict in libavcodec/fraps.c
Text conflict in libavcodec/frwu.c
Text conflict in libavcodec/g726.c
Text conflict in libavcodec/g729.h
Text conflict in libavcodec/g729data.h
Text conflict in libavcodec/g729dec.c
Text conflict in libavcodec/get_bits.h
Text conflict in libavcodec/gif.c
Text conflict in libavcodec/gifdec.c
Text conflict in libavcodec/golomb.h
Text conflict in libavcodec/gsmdec.c
Text conflict in libavcodec/h261.c
Text conflict in libavcodec/h261_parser.c
Text conflict in libavcodec/h261dec.c
Text conflict in libavcodec/h261enc.c
Text conflict in libavcodec/h263.c
Text conflict in libavcodec/h263.h
Text conflict in libavcodec/h263_parser.c
Text conflict in libavcodec/h263data.h
Text conflict in libavcodec/h263dec.c
Text conflict in libavcodec/h264.c
Text conflict in libavcodec/h264.h
Text conflict in libavcodec/h264_cabac.c
Text conflict in libavcodec/h264_cavlc.c
Text conflict in libavcodec/h264_direct.c
Text conflict in libavcodec/h264_loopfilter.c
Text conflict in libavcodec/h264_mp4toannexb_bsf.c
Text conflict in libavcodec/h264_mvpred.h
Text conflict in libavcodec/h264_parser.c
Text conflict in libavcodec/h264_ps.c
Text conflict in libavcodec/h264_refs.c
Text conflict in libavcodec/h264_sei.c
Text conflict in libavcodec/h264data.h
Text conflict in libavcodec/h264dsp.c
Text conflict in libavcodec/h264dsp.h
Text conflict in libavcodec/h264idct.c
Text conflict in libavcodec/h264pred.c
Text conflict in libavcodec/h264pred.h
Text conflict in libavcodec/huffman.c
Text conflict in libavcodec/huffman.h
Text conflict in libavcodec/huffyuv.c
Text conflict in libavcodec/idcinvideo.c
Text conflict in libavcodec/iff.c
Text conflict in libavcodec/iirfilter.c
Text conflict in libavcodec/iirfilter.h
Text conflict in libavcodec/imc.c
Text conflict in libavcodec/imgconvert.c
Text conflict in libavcodec/imgconvert.h
Text conflict in libavcodec/imx_dump_header_bsf.c
Text conflict in libavcodec/indeo2.c
Text conflict in libavcodec/indeo2data.h
Text conflict in libavcodec/indeo3.c
Text conflict in libavcodec/indeo3data.h
Text conflict in libavcodec/indeo5.c
Text conflict in libavcodec/intelh263dec.c
Text conflict in libavcodec/internal.h
Text conflict in libavcodec/interplayvideo.c
Text conflict in libavcodec/intrax8.c
Text conflict in libavcodec/ituh263dec.c
Text conflict in libavcodec/ituh263enc.c
Text conflict in libavcodec/ivi_common.c
Text conflict in libavcodec/ivi_common.h
Text conflict in libavcodec/ivi_dsp.c
Text conflict in libavcodec/ivi_dsp.h
Text conflict in libavcodec/jfdctfst.c
Text conflict in libavcodec/jfdctint.c
Text conflict in libavcodec/jpegls.h
Text conflict in libavcodec/jpeglsdec.c
Text conflict in libavcodec/jpeglsenc.c
Text conflict in libavcodec/jrevdct.c
Text conflict in libavcodec/kgv1dec.c
Text conflict in libavcodec/kmvc.c
Text conflict in libavcodec/lcldec.c
Text conflict in libavcodec/lclenc.c
Text conflict in libavcodec/libavcodec.v
Text conflict in libavcodec/libdirac.h
Text conflict in libavcodec/libdirac_libschro.c
Text conflict in libavcodec/libdirac_libschro.h
Text conflict in libavcodec/libdiracdec.c
Text conflict in libavcodec/libdiracenc.c
Text conflict in libavcodec/libfaac.c
Text conflict in libavcodec/libgsm.c
Text conflict in libavcodec/libmp3lame.c
Text conflict in libavcodec/libopencore-amr.c
Text conflict in libavcodec/libschroedinger.c
Text conflict in libavcodec/libschroedinger.h
Text conflict in libavcodec/libschroedingerdec.c
Text conflict in libavcodec/libschroedingerenc.c
Text conflict in libavcodec/libspeexdec.c
Text conflict in libavcodec/libtheoraenc.c
Text conflict in libavcodec/libvorbis.c
Text conflict in libavcodec/libvpxdec.c
Text conflict in libavcodec/libvpxenc.c
Text conflict in libavcodec/libx264.c
Text conflict in libavcodec/libxavs.c
Text conflict in libavcodec/libxvid_rc.c
Text conflict in libavcodec/libxvidff.c
Text conflict in libavcodec/ljpegenc.c
Text conflict in libavcodec/loco.c
Text conflict in libavcodec/lpc.c
Text conflict in libavcodec/lpc.h
Text conflict in libavcodec/lsp.c
Text conflict in libavcodec/lsp.h
Text conflict in libavcodec/lzw.c
Text conflict in libavcodec/lzw.h
Text conflict in libavcodec/lzwenc.c
Text conflict in libavcodec/mace.c
Text conflict in libavcodec/mathops.h
Text conflict in libavcodec/mdct.c
Text conflict in libavcodec/mdec.c
Text conflict in libavcodec/mimic.c
Text conflict in libavcodec/mips/mathops.h
Text conflict in libavcodec/mjpeg.h
Text conflict in libavcodec/mjpeg_parser.c
Text conflict in libavcodec/mjpega_dump_header_bsf.c
Text conflict in libavcodec/mjpegbdec.c
Text conflict in libavcodec/mjpegdec.c
Text conflict in libavcodec/mjpegdec.h
Text conflict in libavcodec/mjpegenc.c
Text conflict in libavcodec/mlib/dsputil_mlib.c
Text conflict in libavcodec/mlp_parser.c
Text conflict in libavcodec/mlp_parser.h
Text conflict in libavcodec/mlpdec.c
Text conflict in libavcodec/mlpdsp.c
Text conflict in libavcodec/mmvideo.c
Text conflict in libavcodec/motion-test.c
Text conflict in libavcodec/motion_est.c
Text conflict in libavcodec/motion_est_template.c
Text conflict in libavcodec/motionpixels.c
Text conflict in libavcodec/motionpixels_tablegen.h
Text conflict in libavcodec/movsub_bsf.c
Text conflict in libavcodec/mp3_header_compress_bsf.c
Text conflict in libavcodec/mp3_header_decompress_bsf.c
Text conflict in libavcodec/mpc.c
Text conflict in libavcodec/mpc.h
Text conflict in libavcodec/mpc7.c
Text conflict in libavcodec/mpc8.c
Text conflict in libavcodec/mpcdata.h
Text conflict in libavcodec/mpeg12.c
Text conflict in libavcodec/mpeg12.h
Text conflict in libavcodec/mpeg12data.c
Text conflict in libavcodec/mpeg12data.h
Text conflict in libavcodec/mpeg12enc.c
Text conflict in libavcodec/mpeg4audio.c
Text conflict in libavcodec/mpeg4audio.h
Text conflict in libavcodec/mpeg4data.h
Text conflict in libavcodec/mpeg4video.c
Text conflict in libavcodec/mpeg4video.h
Text conflict in libavcodec/mpeg4video_parser.c
Text conflict in libavcodec/mpeg4video_parser.h
Text conflict in libavcodec/mpeg4videodec.c
Text conflict in libavcodec/mpeg4videoenc.c
Text conflict in libavcodec/mpegaudio.h
Text conflict in libavcodec/mpegaudio_parser.c
Text conflict in libavcodec/mpegaudio_tablegen.c
Text conflict in libavcodec/mpegaudio_tablegen.h
Text conflict in libavcodec/mpegaudiodata.c
Text conflict in libavcodec/mpegaudiodata.h
Text conflict in libavcodec/mpegaudiodec.c
Text conflict in libavcodec/mpegaudiodec_float.c
Text conflict in libavcodec/mpegaudiodecheader.c
Text conflict in libavcodec/mpegaudiodecheader.h
Text conflict in libavcodec/mpegaudiodectab.h
Text conflict in libavcodec/mpegaudioenc.c
Text conflict in libavcodec/mpegvideo.c
Text conflict in libavcodec/mpegvideo.h
Text conflict in libavcodec/mpegvideo_common.h
Text conflict in libavcodec/mpegvideo_enc.c
Text conflict in libavcodec/mpegvideo_parser.c
Text conflict in libavcodec/mpegvideo_xvmc.c
Text conflict in libavcodec/msmpeg4.c
Text conflict in libavcodec/msmpeg4.h
Text conflict in libavcodec/msmpeg4data.c
Text conflict in libavcodec/msmpeg4data.h
Text conflict in libavcodec/msrle.c
Text conflict in libavcodec/msrledec.c
Text conflict in libavcodec/msrledec.h
Text conflict in libavcodec/msvideo1.c
Text conflict in libavcodec/nellymoser.c
Text conflict in libavcodec/nellymoser.h
Text conflict in libavcodec/nellymoserdec.c
Text conflict in libavcodec/nellymoserenc.c
Text conflict in libavcodec/noise_bsf.c
Text conflict in libavcodec/nuv.c
Text conflict in libavcodec/options.c
Text conflict in libavcodec/pamenc.c
Text conflict in libavcodec/parser.c
Text conflict in libavcodec/pcm-mpeg.c
Text conflict in libavcodec/pcm.c
Text conflict in libavcodec/pcm_tablegen.c
Text conflict in libavcodec/pcm_tablegen.h
Text conflict in libavcodec/pcx.c
Text conflict in libavcodec/pcxenc.c
Text conflict in libavcodec/pgssubdec.c
Text conflict in libavcodec/pictordec.c
Text conflict in libavcodec/png.c
Text conflict in libavcodec/png.h
Text conflict in libavcodec/pngdec.c
Text conflict in libavcodec/pngenc.c
Text conflict in libavcodec/pnm.c
Text conflict in libavcodec/pnm_parser.c
Text conflict in libavcodec/pnmdec.c
Text conflict in libavcodec/pnmenc.c
Text conflict in libavcodec/ppc/Makefile
Text conflict in libavcodec/ppc/asm.S
Text conflict in libavcodec/ppc/dsputil_altivec.c
Text conflict in libavcodec/ppc/dsputil_altivec.h
Text conflict in libavcodec/ppc/dsputil_ppc.c
Text conflict in libavcodec/ppc/fdct_altivec.c
Text conflict in libavcodec/ppc/fft_altivec.c
Text conflict in libavcodec/ppc/fft_altivec_s.S
Text conflict in libavcodec/ppc/float_altivec.c
Text conflict in libavcodec/ppc/h264_altivec.c
Text conflict in libavcodec/ppc/h264_template_altivec.c
Text conflict in libavcodec/ppc/mpegaudiodec_altivec.c
Text conflict in libavcodec/ppc/mpegvideo_altivec.c
Text conflict in libavcodec/ppc/util_altivec.h
Text conflict in libavcodec/ppc/vc1dsp_altivec.c
Text conflict in libavcodec/ppc/vp8dsp_altivec.c
Text conflict in libavcodec/ps2/dsputil_mmi.c
Text conflict in libavcodec/psymodel.c
Text conflict in libavcodec/psymodel.h
Text conflict in libavcodec/pthread.c
Text conflict in libavcodec/ptx.c
Text conflict in libavcodec/put_bits.h
Text conflict in libavcodec/qcelpdata.h
Text conflict in libavcodec/qcelpdec.c
Text conflict in libavcodec/qdm2.c
Text conflict in libavcodec/qdm2_tablegen.h
Text conflict in libavcodec/qdrw.c
Text conflict in libavcodec/qpeg.c
Text conflict in libavcodec/qtrle.c
Text conflict in libavcodec/qtrleenc.c
Text conflict in libavcodec/r210dec.c
Text conflict in libavcodec/ra144.c
Text conflict in libavcodec/ra144.h
Text conflict in libavcodec/ra144dec.c
Text conflict in libavcodec/ra144enc.c
Text conflict in libavcodec/ra288.c
Text conflict in libavcodec/ra288.h
Text conflict in libavcodec/ratecontrol.c
Text conflict in libavcodec/ratecontrol.h
Text conflict in libavcodec/raw.c
Text conflict in libavcodec/raw.h
Text conflict in libavcodec/rawdec.c
Text conflict in libavcodec/rawenc.c
Text conflict in libavcodec/rdft.c
Text conflict in libavcodec/remove_extradata_bsf.c
Text conflict in libavcodec/resample.c
Text conflict in libavcodec/resample2.c
Text conflict in libavcodec/rl2.c
Text conflict in libavcodec/roqaudioenc.c
Text conflict in libavcodec/roqvideo.c
Text conflict in libavcodec/roqvideodec.c
Text conflict in libavcodec/roqvideoenc.c
Text conflict in libavcodec/rpza.c
Text conflict in libavcodec/rtjpeg.c
Text conflict in libavcodec/rv10.c
Text conflict in libavcodec/rv10enc.c
Text conflict in libavcodec/rv20enc.c
Text conflict in libavcodec/rv30.c
Text conflict in libavcodec/rv30dsp.c
Text conflict in libavcodec/rv34.c
Text conflict in libavcodec/rv34.h
Text conflict in libavcodec/rv34data.h
Text conflict in libavcodec/rv40.c
Text conflict in libavcodec/rv40data.h
Text conflict in libavcodec/rv40dsp.c
Text conflict in libavcodec/s3tc.c
Text conflict in libavcodec/s3tc.h
Text conflict in libavcodec/sbr.h
Text conflict in libavcodec/sgidec.c
Text conflict in libavcodec/sgienc.c
Text conflict in libavcodec/sh4/dsputil_align.c
Text conflict in libavcodec/sh4/dsputil_sh4.c
Text conflict in libavcodec/sh4/dsputil_sh4.h
Text conflict in libavcodec/sh4/idct_sh4.c
Text conflict in libavcodec/sh4/qpel.c
Text conflict in libavcodec/shorten.c
Text conflict in libavcodec/simple_idct.c
Text conflict in libavcodec/simple_idct.h
Text conflict in libavcodec/sipr.c
Text conflict in libavcodec/sipr.h
Text conflict in libavcodec/smacker.c
Text conflict in libavcodec/smc.c
Text conflict in libavcodec/snow.c
Text conflict in libavcodec/snow.h
Text conflict in libavcodec/sonic.c
Text conflict in libavcodec/sp5x.h
Text conflict in libavcodec/sp5xdec.c
Text conflict in libavcodec/sparc/dsputil_vis.c
Text conflict in libavcodec/sparc/dsputil_vis.h
Text conflict in libavcodec/sunrast.c
Text conflict in libavcodec/svq1dec.c
Text conflict in libavcodec/svq1enc.c
Text conflict in libavcodec/svq3.c
Text conflict in libavcodec/synth_filter.c
Text conflict in libavcodec/synth_filter.h
Text conflict in libavcodec/tableprint.h
Text conflict in libavcodec/targa.c
Text conflict in libavcodec/targaenc.c
Text conflict in libavcodec/tiertexseqv.c
Text conflict in libavcodec/tiff.c
Text conflict in libavcodec/tiff.h
Text conflict in libavcodec/tiffenc.c
Text conflict in libavcodec/tmv.c
Text conflict in libavcodec/truemotion1.c
Text conflict in libavcodec/truemotion1data.h
Text conflict in libavcodec/truemotion2.c
Text conflict in libavcodec/truespeech.c
Text conflict in libavcodec/truespeech_data.h
Text conflict in libavcodec/tscc.c
Text conflict in libavcodec/tta.c
Text conflict in libavcodec/twinvq.c
Text conflict in libavcodec/txd.c
Text conflict in libavcodec/ulti.c
Text conflict in libavcodec/utils.c
Text conflict in libavcodec/v210dec.c
Text conflict in libavcodec/v210enc.c
Text conflict in libavcodec/v210x.c
Text conflict in libavcodec/vaapi.c
Text conflict in libavcodec/vaapi.h
Text conflict in libavcodec/vaapi_h264.c
Text conflict in libavcodec/vaapi_internal.h
Text conflict in libavcodec/vaapi_mpeg2.c
Text conflict in libavcodec/vaapi_mpeg4.c
Text conflict in libavcodec/vaapi_vc1.c
Text conflict in libavcodec/vb.c
Text conflict in libavcodec/vc1.c
Text conflict in libavcodec/vc1.h
Text conflict in libavcodec/vc1_parser.c
Text conflict in libavcodec/vc1data.c
Text conflict in libavcodec/vc1data.h
Text conflict in libavcodec/vc1dec.c
Text conflict in libavcodec/vc1dsp.c
Text conflict in libavcodec/vcr1.c
Text conflict in libavcodec/vdpau.c
Text conflict in libavcodec/vdpau.h
Text conflict in libavcodec/vmdav.c
Text conflict in libavcodec/vmnc.c
Text conflict in libavcodec/vorbis.c
Text conflict in libavcodec/vorbis.h
Text conflict in libavcodec/vorbis_data.c
Text conflict in libavcodec/vorbis_enc_data.h
Text conflict in libavcodec/vp3.c
Text conflict in libavcodec/vp3_parser.c
Text conflict in libavcodec/vp5.c
Text conflict in libavcodec/vp56.c
Text conflict in libavcodec/vp56.h
Text conflict in libavcodec/vp56data.c
Text conflict in libavcodec/vp56data.h
Text conflict in libavcodec/vp5data.h
Text conflict in libavcodec/vp6.c
Text conflict in libavcodec/vp6data.h
Text conflict in libavcodec/vp6dsp.c
Text conflict in libavcodec/vp8.c
Text conflict in libavcodec/vp8_parser.c
Text conflict in libavcodec/vp8data.h
Text conflict in libavcodec/vp8dsp.c
Text conflict in libavcodec/vp8dsp.h
Text conflict in libavcodec/vqavideo.c
Text conflict in libavcodec/wavpack.c
Text conflict in libavcodec/wma.c
Text conflict in libavcodec/wma.h
Text conflict in libavcodec/wmadec.c
Text conflict in libavcodec/wmaenc.c
Text conflict in libavcodec/wmaprodec.c
Text conflict in libavcodec/wmavoice.c
Text conflict in libavcodec/wmv2.c
Text conflict in libavcodec/wmv2dec.c
Text conflict in libavcodec/wmv2enc.c
Text conflict in libavcodec/wnv1.c
Text conflict in libavcodec/ws-snd1.c
Text conflict in libavcodec/x86/Makefile
Text conflict in libavcodec/x86/cavsdsp_mmx.c
Text conflict in libavcodec/x86/deinterlace.asm
Text conflict in libavcodec/x86/dnxhd_mmx.c
Text conflict in libavcodec/x86/dsputil_mmx.c
Text conflict in libavcodec/x86/dsputil_mmx.h
Text conflict in libavcodec/x86/dsputil_mmx_avg_template.c
Text conflict in libavcodec/x86/dsputil_mmx_qns_template.c
Text conflict in libavcodec/x86/dsputil_mmx_rnd_template.c
Text conflict in libavcodec/x86/dsputil_yasm.asm
Text conflict in libavcodec/x86/dsputilenc_mmx.c
Text conflict in libavcodec/x86/fdct_mmx.c
Text conflict in libavcodec/x86/fft.c
Text conflict in libavcodec/x86/fft.h
Text conflict in libavcodec/x86/fft_3dn2.c
Text conflict in libavcodec/x86/fft_mmx.asm
Text conflict in libavcodec/x86/fft_sse.c
Text conflict in libavcodec/x86/h264_i386.h
Text conflict in libavcodec/x86/h264_intrapred.asm
Text conflict in libavcodec/x86/h264dsp_mmx.c
Text conflict in libavcodec/x86/idct_mmx.c
Text conflict in libavcodec/x86/idct_sse2_xvid.c
Text conflict in libavcodec/x86/idct_xvid.h
Text conflict in libavcodec/x86/lpc_mmx.c
Text conflict in libavcodec/x86/mathops.h
Text conflict in libavcodec/x86/mlpdsp.c
Text conflict in libavcodec/x86/motion_est_mmx.c
Text conflict in libavcodec/x86/mpegaudiodec_mmx.c
Text conflict in libavcodec/x86/mpegvideo_mmx.c
Text conflict in libavcodec/x86/mpegvideo_mmx_template.c
Text conflict in libavcodec/x86/simple_idct_mmx.c
Text conflict in libavcodec/x86/snowdsp_mmx.c
Text conflict in libavcodec/x86/vc1dsp_mmx.c
Text conflict in libavcodec/x86/vc1dsp_yasm.asm
Text conflict in libavcodec/x86/vp56dsp.asm
Text conflict in libavcodec/x86/vp56dsp_init.c
Text conflict in libavcodec/x86/vp8dsp-init.c
Text conflict in libavcodec/x86/vp8dsp.asm
Text conflict in libavcodec/xan.c
Text conflict in libavcodec/xiph.c
Text conflict in libavcodec/xiph.h
Text conflict in libavcodec/xl.c
Text conflict in libavcodec/xsubdec.c
Text conflict in libavcodec/xsubenc.c
Text conflict in libavcodec/xvmc.h
Text conflict in libavcodec/xvmc_internal.h
Text conflict in libavcodec/yop.c
Text conflict in libavcodec/zmbv.c
Text conflict in libavcodec/zmbvenc.c
Text conflict in libavdevice/Makefile
Text conflict in libavdevice/alldevices.c
Text conflict in libavdevice/alsa-audio-common.c
Text conflict in libavdevice/alsa-audio-dec.c
Text conflict in libavdevice/alsa-audio-enc.c
Text conflict in libavdevice/alsa-audio.h
Text conflict in libavdevice/avdevice.c
Text conflict in libavdevice/avdevice.h
Text conflict in libavdevice/bktr.c
Text conflict in libavdevice/dv1394.c
Text conflict in libavdevice/dv1394.h
Text conflict in libavdevice/jack_audio.c
Text conflict in libavdevice/libdc1394.c
Text conflict in libavdevice/oss_audio.c
Text conflict in libavdevice/v4l.c
Text conflict in libavdevice/v4l2.c
Text conflict in libavdevice/vfwcap.c
Text conflict in libavdevice/x11grab.c
Text conflict in libavfilter/Makefile
Text conflict in libavfilter/af_anull.c
Text conflict in libavfilter/allfilters.c
Text conflict in libavfilter/avfilter.c
Text conflict in libavfilter/avfilter.h
Text conflict in libavfilter/avfiltergraph.c
Text conflict in libavfilter/avfiltergraph.h
Text conflict in libavfilter/defaults.c
Text conflict in libavfilter/formats.c
Text conflict in libavfilter/graphparser.c
Text conflict in libavfilter/internal.h
Text conflict in libavfilter/vf_aspect.c
Text conflict in libavfilter/vf_crop.c
Text conflict in libavfilter/vf_fifo.c
Text conflict in libavfilter/vf_format.c
Text conflict in libavfilter/vf_hflip.c
Text conflict in libavfilter/vf_null.c
Text conflict in libavfilter/vf_pad.c
Text conflict in libavfilter/vf_pixdesctest.c
Text conflict in libavfilter/vf_scale.c
Text conflict in libavfilter/vf_slicify.c
Text conflict in libavfilter/vf_unsharp.c
Text conflict in libavfilter/vf_vflip.c
Text conflict in libavfilter/vsink_nullsink.c
Text conflict in libavfilter/vsrc_buffer.c
Text conflict in libavfilter/vsrc_buffer.h
Text conflict in libavformat/4xm.c
Text conflict in libavformat/Makefile
Text conflict in libavformat/a64.c
Text conflict in libavformat/aacdec.c
Text conflict in libavformat/ac3dec.c
Text conflict in libavformat/adtsenc.c
Text conflict in libavformat/aea.c
Text conflict in libavformat/aiff.h
Text conflict in libavformat/aiffdec.c
Text conflict in libavformat/aiffenc.c
Text conflict in libavformat/allformats.c
Text conflict in libavformat/amr.c
Text conflict in libavformat/anm.c
Text conflict in libavformat/apc.c
Text conflict in libavformat/ape.c
Text conflict in libavformat/apetag.c
Text conflict in libavformat/applehttp.c
Text conflict in libavformat/asf.c
Text conflict in libavformat/asf.h
Text conflict in libavformat/asfcrypt.c
Text conflict in libavformat/asfdec.c
Text conflict in libavformat/asfenc.c
Text conflict in libavformat/assdec.c
Text conflict in libavformat/assenc.c
Text conflict in libavformat/au.c
Text conflict in libavformat/audiointerleave.c
Text conflict in libavformat/audiointerleave.h
Text conflict in libavformat/avc.c
Text conflict in libavformat/avc.h
Text conflict in libavformat/avformat.h
Text conflict in libavformat/avi.h
Text conflict in libavformat/avidec.c
Text conflict in libavformat/avienc.c
Text conflict in libavformat/avio.c
Text conflict in libavformat/avio.h
Text conflict in libavformat/aviobuf.c
Text conflict in libavformat/avisynth.c
Text conflict in libavformat/avlanguage.c
Text conflict in libavformat/avs.c
Text conflict in libavformat/bethsoftvid.c
Text conflict in libavformat/bfi.c
Text conflict in libavformat/bink.c
Text conflict in libavformat/c93.c
Text conflict in libavformat/caf.c
Text conflict in libavformat/cafdec.c
Text conflict in libavformat/cavsvideodec.c
Text conflict in libavformat/cdg.c
Text conflict in libavformat/concat.c
Text conflict in libavformat/crcenc.c
Text conflict in libavformat/cutils.c
Text conflict in libavformat/daud.c
Text conflict in libavformat/diracdec.c
Text conflict in libavformat/dnxhddec.c
Text conflict in libavformat/dsicin.c
Text conflict in libavformat/dtsdec.c
Text conflict in libavformat/dv.c
Text conflict in libavformat/dv.h
Text conflict in libavformat/dvenc.c
Text conflict in libavformat/dxa.c
Text conflict in libavformat/eacdata.c
Text conflict in libavformat/electronicarts.c
Text conflict in libavformat/ffm.h
Text conflict in libavformat/ffmdec.c
Text conflict in libavformat/ffmenc.c
Text conflict in libavformat/file.c
Text conflict in libavformat/filmstripdec.c
Text conflict in libavformat/filmstripenc.c
Text conflict in libavformat/flacdec.c
Text conflict in libavformat/flacenc.c
Text conflict in libavformat/flacenc.h
Text conflict in libavformat/flacenc_header.c
Text conflict in libavformat/flic.c
Text conflict in libavformat/flv.h
Text conflict in libavformat/flvdec.c
Text conflict in libavformat/flvenc.c
Text conflict in libavformat/framecrcenc.c
Text conflict in libavformat/gif.c
Text conflict in libavformat/gopher.c
Text conflict in libavformat/gxf.c
Text conflict in libavformat/gxfenc.c
Text conflict in libavformat/h261dec.c
Text conflict in libavformat/h263dec.c
Text conflict in libavformat/h264dec.c
Text conflict in libavformat/http.c
Text conflict in libavformat/http.h
Text conflict in libavformat/httpauth.c
Text conflict in libavformat/id3v1.c
Text conflict in libavformat/id3v1.h
Text conflict in libavformat/id3v2.c
Text conflict in libavformat/id3v2.h
Text conflict in libavformat/idcin.c
Text conflict in libavformat/idroqdec.c
Text conflict in libavformat/idroqenc.c
Text conflict in libavformat/iff.c
Text conflict in libavformat/img2.c
Text conflict in libavformat/ingenientdec.c
Text conflict in libavformat/internal.h
Text conflict in libavformat/ipmovie.c
Text conflict in libavformat/isom.c
Text conflict in libavformat/isom.h
Text conflict in libavformat/iss.c
Text conflict in libavformat/iv8.c
Text conflict in libavformat/ivfdec.c
Text conflict in libavformat/libavformat.v
Text conflict in libavformat/libnut.c
Text conflict in libavformat/librtmp.c
Text conflict in libavformat/lmlm4.c
Text conflict in libavformat/m4vdec.c
Text conflict in libavformat/matroska.c
Text conflict in libavformat/matroska.h
Text conflict in libavformat/matroskadec.c
Text conflict in libavformat/matroskaenc.c
Text conflict in libavformat/md5enc.c
Text conflict in libavformat/md5proto.c
Text conflict in libavformat/metadata.c
Text conflict in libavformat/metadata.h
Text conflict in libavformat/mm.c
Text conflict in libavformat/mmf.c
Text conflict in libavformat/mms.c
Text conflict in libavformat/mms.h
Text conflict in libavformat/mmsh.c
Text conflict in libavformat/mmst.c
Text conflict in libavformat/mov.c
Text conflict in libavformat/movenc.c
Text conflict in libavformat/movenc.h
Text conflict in libavformat/movenchint.c
Text conflict in libavformat/mpc.c
Text conflict in libavformat/mpc8.c
Text conflict in libavformat/mpeg.c
Text conflict in libavformat/mpeg.h
Text conflict in libavformat/mpegenc.c
Text conflict in libavformat/mpegts.c
Text conflict in libavformat/mpegts.h
Text conflict in libavformat/mpegtsenc.c
Text conflict in libavformat/mpegvideodec.c
Text conflict in libavformat/mpjpeg.c
Text conflict in libavformat/msnwc_tcp.c
Text conflict in libavformat/mtv.c
Text conflict in libavformat/mvi.c
Text conflict in libavformat/mxf.c
Text conflict in libavformat/mxf.h
Text conflict in libavformat/mxfdec.c
Text conflict in libavformat/mxfenc.c
Text conflict in libavformat/ncdec.c
Text conflict in libavformat/network.h
Text conflict in libavformat/nsvdec.c
Text conflict in libavformat/nullenc.c
Text conflict in libavformat/nut.c
Text conflict in libavformat/nut.h
Text conflict in libavformat/nutdec.c
Text conflict in libavformat/nutenc.c
Text conflict in libavformat/nuv.c
Text conflict in libavformat/oggdec.c
Text conflict in libavformat/oggdec.h
Text conflict in libavformat/oggenc.c
Text conflict in libavformat/oggparsedirac.c
Text conflict in libavformat/oggparseflac.c
Text conflict in libavformat/oggparseogm.c
Text conflict in libavformat/oggparseskeleton.c
Text conflict in libavformat/oggparsespeex.c
Text conflict in libavformat/oggparsetheora.c
Text conflict in libavformat/oggparsevorbis.c
Text conflict in libavformat/oma.c
Text conflict in libavformat/options.c
Text conflict in libavformat/os_support.c
Text conflict in libavformat/os_support.h
Text conflict in libavformat/psxstr.c
Text conflict in libavformat/pva.c
Text conflict in libavformat/qcp.c
Text conflict in libavformat/r3d.c
Text conflict in libavformat/rdt.c
Text conflict in libavformat/rdt.h
Text conflict in libavformat/riff.c
Text conflict in libavformat/riff.h
Text conflict in libavformat/rl2.c
Text conflict in libavformat/rm.h
Text conflict in libavformat/rmdec.c
Text conflict in libavformat/rmenc.c
Text conflict in libavformat/rpl.c
Text conflict in libavformat/rso.h
Text conflict in libavformat/rsodec.c
Text conflict in libavformat/rsoenc.c
Text conflict in libavformat/rtmppkt.c
Text conflict in libavformat/rtmppkt.h
Text conflict in libavformat/rtmpproto.c
Text conflict in libavformat/rtp.c
Text conflict in libavformat/rtp.h
Text conflict in libavformat/rtpdec.c
Text conflict in libavformat/rtpdec.h
Text conflict in libavformat/rtpdec_amr.c
Text conflict in libavformat/rtpdec_asf.c
Text conflict in libavformat/rtpdec_formats.h
Text conflict in libavformat/rtpdec_h263.c
Text conflict in libavformat/rtpdec_h264.c
Text conflict in libavformat/rtpdec_latm.c
Text conflict in libavformat/rtpdec_mpeg4.c
Text conflict in libavformat/rtpdec_qdm2.c
Text conflict in libavformat/rtpdec_svq3.c
Text conflict in libavformat/rtpdec_vp8.c
Text conflict in libavformat/rtpdec_xiph.c
Text conflict in libavformat/rtpenc.c
Text conflict in libavformat/rtpenc.h
Text conflict in libavformat/rtpenc_amr.c
Text conflict in libavformat/rtpenc_h264.c
Text conflict in libavformat/rtpenc_mpv.c
Text conflict in libavformat/rtpproto.c
Text conflict in libavformat/rtsp.c
Text conflict in libavformat/rtsp.h
Text conflict in libavformat/rtspenc.c
Text conflict in libavformat/sauce.c
Text conflict in libavformat/sdp.c
Text conflict in libavformat/seek.c
Text conflict in libavformat/segafilm.c
Text conflict in libavformat/sierravmd.c
Text conflict in libavformat/siff.c
Text conflict in libavformat/smacker.c
Text conflict in libavformat/sol.c
Text conflict in libavformat/soxdec.c
Text conflict in libavformat/soxenc.c
Text conflict in libavformat/spdif.c
Text conflict in libavformat/srtdec.c
Text conflict in libavformat/swfdec.c
Text conflict in libavformat/swfenc.c
Text conflict in libavformat/tcp.c
Text conflict in libavformat/thp.c
Text conflict in libavformat/tiertexseq.c
Text conflict in libavformat/tmv.c
Text conflict in libavformat/tta.c
Text conflict in libavformat/tty.c
Text conflict in libavformat/txd.c
Text conflict in libavformat/udp.c
Text conflict in libavformat/utils.c
Text conflict in libavformat/vc1test.c
Text conflict in libavformat/vc1testenc.c
Text conflict in libavformat/vocdec.c
Text conflict in libavformat/vocenc.c
Text conflict in libavformat/vorbiscomment.c
Text conflict in libavformat/vorbiscomment.h
Text conflict in libavformat/vqf.c
Text conflict in libavformat/wav.c
Text conflict in libavformat/wc3movie.c
Text conflict in libavformat/wv.c
Text conflict in libavformat/xa.c
Text conflict in libavformat/yop.c
Text conflict in libavformat/yuv4mpeg.c
Text conflict in libavutil/Makefile
Text conflict in libavutil/adler32.c
Text conflict in libavutil/adler32.h
Text conflict in libavutil/aes.c
Text conflict in libavutil/aes.h
Text conflict in libavutil/arm/bswap.h
Text conflict in libavutil/arm/intmath.h
Text conflict in libavutil/arm/intreadwrite.h
Text conflict in libavutil/attributes.h
Text conflict in libavutil/avstring.c
Text conflict in libavutil/avstring.h
Text conflict in libavutil/avutil.h
Text conflict in libavutil/base64.c
Text conflict in libavutil/base64.h
Text conflict in libavutil/bswap.h
Text conflict in libavutil/common.h
Text conflict in libavutil/crc.c
Text conflict in libavutil/crc.h
Text conflict in libavutil/des.c
Text conflict in libavutil/des.h
Text conflict in libavutil/error.c
Text conflict in libavutil/error.h
Text conflict in libavutil/eval.c
Text conflict in libavutil/eval.h
Text conflict in libavutil/fifo.c
Text conflict in libavutil/fifo.h
Text conflict in libavutil/internal.h
Text conflict in libavutil/intfloat_readwrite.c
Text conflict in libavutil/intfloat_readwrite.h
Text conflict in libavutil/intmath.h
Text conflict in libavutil/intreadwrite.h
Text conflict in libavutil/inverse.c
Text conflict in libavutil/lfg.c
Text conflict in libavutil/lfg.h
Text conflict in libavutil/libm.h
Text conflict in libavutil/lls.c
Text conflict in libavutil/log.c
Text conflict in libavutil/log.h
Text conflict in libavutil/lzo.c
Text conflict in libavutil/lzo.h
Text conflict in libavutil/mathematics.c
Text conflict in libavutil/mathematics.h
Text conflict in libavutil/md5.c
Text conflict in libavutil/md5.h
Text conflict in libavutil/mem.c
Text conflict in libavutil/mem.h
Text conflict in libavutil/mips/intreadwrite.h
Text conflict in libavutil/pca.c
Text conflict in libavutil/pixdesc.c
Text conflict in libavutil/pixdesc.h
Text conflict in libavutil/pixfmt.h
Text conflict in libavutil/random_seed.c
Text conflict in libavutil/random_seed.h
Text conflict in libavutil/rational.c
Text conflict in libavutil/rational.h
Text conflict in libavutil/rc4.h
Text conflict in libavutil/sha.c
Text conflict in libavutil/sha.h
Text conflict in libavutil/timer.h
Text conflict in libavutil/tree.c
Text conflict in libavutil/tree.h
Text conflict in libavutil/utils.c
Text conflict in libavutil/x86/bswap.h
Text conflict in libavutil/x86_cpu.h
Text conflict in libpostproc/Makefile
Text conflict in libpostproc/postprocess.c
Text conflict in libpostproc/postprocess.h
Text conflict in libpostproc/postprocess_altivec_template.c
Text conflict in libpostproc/postprocess_internal.h
Text conflict in libpostproc/postprocess_template.c
Text conflict in tests/audiogen.c
Text conflict in tests/base64.c
Text conflict in tests/codec-regression.sh
Text conflict in tests/fate-run.sh
Text conflict in tests/fate.sh
Text conflict in tests/fate/aac.mak
Text conflict in tests/fate/fft.mak
Text conflict in tests/fate/h264.mak
Text conflict in tests/fate/mp3.mak
Text conflict in tests/lavf-regression.sh
Text conflict in tests/lavfi-regression.sh
Text conflict in tests/md5.sh
Text conflict in tests/ref/acodec/adpcm_ima_qt
Text conflict in tests/ref/acodec/adpcm_ima_wav
Text conflict in tests/ref/acodec/adpcm_ms
Text conflict in tests/ref/acodec/adpcm_swf
Text conflict in tests/ref/acodec/adpcm_yam
Text conflict in tests/ref/acodec/alac
Text conflict in tests/ref/acodec/flac
Text conflict in tests/ref/acodec/g726
Text conflict in tests/ref/acodec/mp2
Text conflict in tests/ref/fate/8bps
Text conflict in tests/ref/fate/aasc
Text conflict in tests/ref/fate/alg-mm
Text conflict in tests/ref/fate/amv
Text conflict in tests/ref/fate/ansi
Text conflict in tests/ref/fate/armovie-escape124
Text conflict in tests/ref/fate/auravision-v2
Text conflict in tests/ref/fate/bethsoft-vid
Text conflict in tests/ref/fate/bfi
Text conflict in tests/ref/fate/cdgraphics
Text conflict in tests/ref/fate/cljr
Text conflict in tests/ref/fate/corepng
Text conflict in tests/ref/fate/creatureshock-avs
Text conflict in tests/ref/fate/cscd
Text conflict in tests/ref/fate/cvid-palette
Text conflict in tests/ref/fate/cyberia-c93
Text conflict in tests/ref/fate/cyuv
Text conflict in tests/ref/fate/d-cinema-demux
Text conflict in tests/ref/fate/delphine-cin
Text conflict in tests/ref/fate/deluxepaint-anm
Text conflict in tests/ref/fate/dpx
Text conflict in tests/ref/fate/ea-cmv
Text conflict in tests/ref/fate/ea-dct
Text conflict in tests/ref/fate/ea-mad-pcm-planar
Text conflict in tests/ref/fate/ea-tgq
Text conflict in tests/ref/fate/ea-tgv-ima-ea-eacs
Text conflict in tests/ref/fate/ea-tgv-ima-ea-sead
Text conflict in tests/ref/fate/ea-vp60
Text conflict in tests/ref/fate/ea-vp61
Text conflict in tests/ref/fate/film-cvid-pcm-stereo-8bit
Text conflict in tests/ref/fate/flic-af11-palette-change
Text conflict in tests/ref/fate/flic-af12
Text conflict in tests/ref/fate/flic-magiccarpet
Text conflict in tests/ref/fate/fraps-v0
Text conflict in tests/ref/fate/fraps-v1
Text conflict in tests/ref/fate/fraps-v2
Text conflict in tests/ref/fate/fraps-v3
Text conflict in tests/ref/fate/fraps-v4
Text conflict in tests/ref/fate/fraps-v5
Text conflict in tests/ref/fate/frwu
Text conflict in tests/ref/fate/h264-conformance-aud_mw_e
Text conflict in tests/ref/fate/h264-conformance-ba1_ft_c
Text conflict in tests/ref/fate/h264-conformance-ba1_sony_d
Text conflict in tests/ref/fate/h264-conformance-ba2_sony_f
Text conflict in tests/ref/fate/h264-conformance-ba3_sva_c
Text conflict in tests/ref/fate/h264-conformance-ba_mw_d
Text conflict in tests/ref/fate/h264-conformance-bamq1_jvc_c
Text conflict in tests/ref/fate/h264-conformance-bamq2_jvc_c
Text conflict in tests/ref/fate/h264-conformance-banm_mw_d
Text conflict in tests/ref/fate/h264-conformance-basqp1_sony_c
Text conflict in tests/ref/fate/h264-conformance-caba1_sony_d
Text conflict in tests/ref/fate/h264-conformance-caba1_sva_b
Text conflict in tests/ref/fate/h264-conformance-caba2_sony_e
Text conflict in tests/ref/fate/h264-conformance-caba2_sva_b
Text conflict in tests/ref/fate/h264-conformance-caba3_sony_c
Text conflict in tests/ref/fate/h264-conformance-caba3_sva_b
Text conflict in tests/ref/fate/h264-conformance-caba3_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-cabac_mot_fld0_full
Text conflict in tests/ref/fate/h264-conformance-cabac_mot_frm0_full
Text conflict in tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
Text conflict in tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
Text conflict in tests/ref/fate/h264-conformance-cabaci3_sony_b
Text conflict in tests/ref/fate/h264-conformance-cabast3_sony_e
Text conflict in tests/ref/fate/h264-conformance-cabastbr3_sony_b
Text conflict in tests/ref/fate/h264-conformance-cabref3_sand_d
Text conflict in tests/ref/fate/h264-conformance-cacqp3_sony_d
Text conflict in tests/ref/fate/h264-conformance-cafi1_sva_c
Text conflict in tests/ref/fate/h264-conformance-cama1_sony_c
Text conflict in tests/ref/fate/h264-conformance-cama1_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-cama1_vtc_c
Text conflict in tests/ref/fate/h264-conformance-cama2_vtc_b
Text conflict in tests/ref/fate/h264-conformance-cama3_sand_e
Text conflict in tests/ref/fate/h264-conformance-cama3_vtc_b
Text conflict in tests/ref/fate/h264-conformance-camaci3_sony_c
Text conflict in tests/ref/fate/h264-conformance-camanl1_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-camanl2_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-camanl3_sand_e
Text conflict in tests/ref/fate/h264-conformance-camasl3_sony_b
Text conflict in tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
Text conflict in tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
Text conflict in tests/ref/fate/h264-conformance-canl1_sony_e
Text conflict in tests/ref/fate/h264-conformance-canl1_sva_b
Text conflict in tests/ref/fate/h264-conformance-canl1_toshiba_g
Text conflict in tests/ref/fate/h264-conformance-canl2_sony_e
Text conflict in tests/ref/fate/h264-conformance-canl2_sva_b
Text conflict in tests/ref/fate/h264-conformance-canl3_sony_c
Text conflict in tests/ref/fate/h264-conformance-canl3_sva_b
Text conflict in tests/ref/fate/h264-conformance-canl4_sva_b
Text conflict in tests/ref/fate/h264-conformance-canlma2_sony_c
Text conflict in tests/ref/fate/h264-conformance-canlma3_sony_c
Text conflict in tests/ref/fate/h264-conformance-capa1_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-capama3_sand_f
Text conflict in tests/ref/fate/h264-conformance-capcm1_sand_e
Text conflict in tests/ref/fate/h264-conformance-capcmnl1_sand_e
Text conflict in tests/ref/fate/h264-conformance-capm3_sony_d
Text conflict in tests/ref/fate/h264-conformance-caqp1_sony_b
Text conflict in tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
Text conflict in tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
Text conflict in tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
Text conflict in tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
Text conflict in tests/ref/fate/h264-conformance-cawp1_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-cawp5_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-ci1_ft_b
Text conflict in tests/ref/fate/h264-conformance-ci_mw_d
Text conflict in tests/ref/fate/h264-conformance-cvbs3_sony_c
Text conflict in tests/ref/fate/h264-conformance-cvcanlma2_sony_c
Text conflict in tests/ref/fate/h264-conformance-cvfi1_sony_d
Text conflict in tests/ref/fate/h264-conformance-cvfi1_sva_c
Text conflict in tests/ref/fate/h264-conformance-cvfi2_sony_h
Text conflict in tests/ref/fate/h264-conformance-cvfi2_sva_c
Text conflict in tests/ref/fate/h264-conformance-cvma1_sony_d
Text conflict in tests/ref/fate/h264-conformance-cvma1_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
Text conflict in tests/ref/fate/h264-conformance-cvmaqp2_sony_g
Text conflict in tests/ref/fate/h264-conformance-cvmaqp3_sony_d
Text conflict in tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
Text conflict in tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
Text conflict in tests/ref/fate/h264-conformance-cvnlfi1_sony_c
Text conflict in tests/ref/fate/h264-conformance-cvnlfi2_sony_h
Text conflict in tests/ref/fate/h264-conformance-cvpa1_toshiba_b
Text conflict in tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
Text conflict in tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
Text conflict in tests/ref/fate/h264-conformance-cvwp1_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-cvwp2_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-cvwp3_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-cvwp5_toshiba_e
Text conflict in tests/ref/fate/h264-conformance-fi1_sony_e
Text conflict in tests/ref/fate/h264-conformance-frext-alphaconformanceg
Text conflict in tests/ref/fate/h264-conformance-frext-bcrm_freh10
Text conflict in tests/ref/fate/h264-conformance-frext-brcm_freh11
Text conflict in tests/ref/fate/h264-conformance-frext-brcm_freh3
Text conflict in tests/ref/fate/h264-conformance-frext-brcm_freh4
Text conflict in tests/ref/fate/h264-conformance-frext-brcm_freh5
Text conflict in tests/ref/fate/h264-conformance-frext-brcm_freh8
Text conflict in tests/ref/fate/h264-conformance-frext-brcm_freh9
Text conflict in tests/ref/fate/h264-conformance-frext-freh12_b
Text conflict in tests/ref/fate/h264-conformance-frext-freh1_b
Text conflict in tests/ref/fate/h264-conformance-frext-freh2_b
Text conflict in tests/ref/fate/h264-conformance-frext-freh6
Text conflict in tests/ref/fate/h264-conformance-frext-freh7_b
Text conflict in tests/ref/fate/h264-conformance-frext-frext01_jvc_d
Text conflict in tests/ref/fate/h264-conformance-frext-frext02_jvc_c
Text conflict in tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
Text conflict in tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
Text conflict in tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
Text conflict in tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
Text conflict in tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
Text conflict in tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
Text conflict in tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
Text conflict in tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
Text conflict in tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
Text conflict in tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
Text conflict in tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpca_brcm_c
Text conflict in tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
Text conflict in tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
Text conflict in tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
Text conflict in tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
Text conflict in tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
Text conflict in tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
Text conflict in tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
Text conflict in tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
Text conflict in tests/ref/fate/h264-conformance-hcbp2_hhi_a
Text conflict in tests/ref/fate/h264-conformance-hcmp1_hhi_a
Text conflict in tests/ref/fate/h264-conformance-ls_sva_d
Text conflict in tests/ref/fate/h264-conformance-midr_mw_d
Text conflict in tests/ref/fate/h264-conformance-mps_mw_a
Text conflict in tests/ref/fate/h264-conformance-mr1_bt_a
Text conflict in tests/ref/fate/h264-conformance-mr1_mw_a
Text conflict in tests/ref/fate/h264-conformance-mr2_mw_a
Text conflict in tests/ref/fate/h264-conformance-mr2_tandberg_e
Text conflict in tests/ref/fate/h264-conformance-mr3_tandberg_b
Text conflict in tests/ref/fate/h264-conformance-mr4_tandberg_c
Text conflict in tests/ref/fate/h264-conformance-mr5_tandberg_c
Text conflict in tests/ref/fate/h264-conformance-mr6_bt_b
Text conflict in tests/ref/fate/h264-conformance-mr7_bt_b
Text conflict in tests/ref/fate/h264-conformance-mr8_bt_b
Text conflict in tests/ref/fate/h264-conformance-mr9_bt_b
Text conflict in tests/ref/fate/h264-conformance-mv1_brcm_d
Text conflict in tests/ref/fate/h264-conformance-nl1_sony_d
Text conflict in tests/ref/fate/h264-conformance-nl2_sony_h
Text conflict in tests/ref/fate/h264-conformance-nl3_sva_e
Text conflict in tests/ref/fate/h264-conformance-nlmq1_jvc_c
Text conflict in tests/ref/fate/h264-conformance-nlmq2_jvc_c
Text conflict in tests/ref/fate/h264-conformance-nrf_mw_e
Text conflict in tests/ref/fate/h264-conformance-sharp_mp_field_1_b
Text conflict in tests/ref/fate/h264-conformance-sharp_mp_field_2_b
Text conflict in tests/ref/fate/h264-conformance-sharp_mp_field_3_b
Text conflict in tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
Text conflict in tests/ref/fate/h264-conformance-sharp_mp_paff_2r
Text conflict in tests/ref/fate/h264-conformance-sl1_sva_b
Text conflict in tests/ref/fate/h264-conformance-sva_ba1_b
Text conflict in tests/ref/fate/h264-conformance-sva_ba2_d
Text conflict in tests/ref/fate/h264-conformance-sva_base_b
Text conflict in tests/ref/fate/h264-conformance-sva_cl1_e
Text conflict in tests/ref/fate/h264-conformance-sva_fm1_e
Text conflict in tests/ref/fate/h264-conformance-sva_nl1_b
Text conflict in tests/ref/fate/h264-conformance-sva_nl2_e
Text conflict in tests/ref/fate/id-cin-video
Text conflict in tests/ref/fate/iff-byterun1
Text conflict in tests/ref/fate/iff-fibonacci
Text conflict in tests/ref/fate/iff-ilbm
Text conflict in tests/ref/fate/indeo2
Text conflict in tests/ref/fate/indeo3
Text conflict in tests/ref/fate/indeo5
Text conflict in tests/ref/fate/interplay-mve-16bit
Text conflict in tests/ref/fate/interplay-mve-8bit
Text conflict in tests/ref/fate/iv8-demux
Text conflict in tests/ref/fate/kmvc
Text conflict in tests/ref/fate/lmlm4-demux
Text conflict in tests/ref/fate/loco-rgb
Text conflict in tests/ref/fate/loco-yuy2
Text conflict in tests/ref/fate/mimic
Text conflict in tests/ref/fate/motionpixels
Text conflict in tests/ref/fate/mpeg2-field-enc
Text conflict in tests/ref/fate/msmpeg4v1
Text conflict in tests/ref/fate/msrle-8bit
Text conflict in tests/ref/fate/msvideo1-16bit
Text conflict in tests/ref/fate/msvideo1-8bit
Text conflict in tests/ref/fate/mszh
Text conflict in tests/ref/fate/mtv
Text conflict in tests/ref/fate/mxf-demux
Text conflict in tests/ref/fate/nc-demux
Text conflict in tests/ref/fate/nsv-demux
Text conflict in tests/ref/fate/nuv
Text conflict in tests/ref/fate/pcm_dvd
Text conflict in tests/ref/fate/pictor
Text conflict in tests/ref/fate/psx-str
Text conflict in tests/ref/fate/ptx
Text conflict in tests/ref/fate/pva-demux
Text conflict in tests/ref/fate/qpeg
Text conflict in tests/ref/fate/qt-ima4-mono
Text conflict in tests/ref/fate/qt-ima4-stereo
Text conflict in tests/ref/fate/qtrle-16bit
Text conflict in tests/ref/fate/qtrle-1bit
Text conflict in tests/ref/fate/qtrle-24bit
Text conflict in tests/ref/fate/qtrle-2bit
Text conflict in tests/ref/fate/qtrle-32bit
Text conflict in tests/ref/fate/qtrle-4bit
Text conflict in tests/ref/fate/qtrle-8bit
Text conflict in tests/ref/fate/quickdraw
Text conflict in tests/ref/fate/real-rv40
Text conflict in tests/ref/fate/redcode-demux
Text conflict in tests/ref/fate/rl2
Text conflict in tests/ref/fate/rpza
Text conflict in tests/ref/fate/sierra-vmd
Text conflict in tests/ref/fate/siff
Text conflict in tests/ref/fate/smacker
Text conflict in tests/ref/fate/smc
Text conflict in tests/ref/fate/sp5x
Text conflict in tests/ref/fate/sunraster-1bit-raw
Text conflict in tests/ref/fate/sunraster-1bit-rle
Text conflict in tests/ref/fate/sunraster-24bit-raw
Text conflict in tests/ref/fate/sunraster-24bit-rle
Text conflict in tests/ref/fate/sunraster-8bit-raw
Text conflict in tests/ref/fate/sunraster-8bit-rle
Text conflict in tests/ref/fate/svq1
Text conflict in tests/ref/fate/svq3
Text conflict in tests/ref/fate/tiertex-seq
Text conflict in tests/ref/fate/tmv
Text conflict in tests/ref/fate/truemotion1-15
Text conflict in tests/ref/fate/truemotion1-24
Text conflict in tests/ref/fate/tscc-15bit
Text conflict in tests/ref/fate/tscc-32bit
Text conflict in tests/ref/fate/txd-16bpp
Text conflict in tests/ref/fate/txd-pal8
Text conflict in tests/ref/fate/ulti
Text conflict in tests/ref/fate/v210
Text conflict in tests/ref/fate/vcr1
Text conflict in tests/ref/fate/vmnc-16bit
Text conflict in tests/ref/fate/vmnc-32bit
Text conflict in tests/ref/fate/vp5
Text conflict in tests/ref/fate/vp6a
Text conflict in tests/ref/fate/vp6f
Text conflict in tests/ref/fate/vp8-sign-bias
Text conflict in tests/ref/fate/vp8-test-vector-001
Text conflict in tests/ref/fate/vp8-test-vector-002
Text conflict in tests/ref/fate/vp8-test-vector-003
Text conflict in tests/ref/fate/vp8-test-vector-004
Text conflict in tests/ref/fate/vp8-test-vector-005
Text conflict in tests/ref/fate/vp8-test-vector-006
Text conflict in tests/ref/fate/vp8-test-vector-007
Text conflict in tests/ref/fate/vp8-test-vector-008
Text conflict in tests/ref/fate/vp8-test-vector-009
Text conflict in tests/ref/fate/vp8-test-vector-010
Text conflict in tests/ref/fate/vp8-test-vector-011
Text conflict in tests/ref/fate/vp8-test-vector-012
Text conflict in tests/ref/fate/vp8-test-vector-013
Text conflict in tests/ref/fate/vp8-test-vector-014
Text conflict in tests/ref/fate/vp8-test-vector-015
Text conflict in tests/ref/fate/vp8-test-vector-016
Text conflict in tests/ref/fate/vp8-test-vector-017
Text conflict in tests/ref/fate/vqa-cc
Text conflict in tests/ref/fate/vqf-demux
Text conflict in tests/ref/fate/wc3movie-xan
Text conflict in tests/ref/fate/wmv8-drm
Text conflict in tests/ref/fate/wnv1
Text conflict in tests/ref/fate/yop
Text conflict in tests/ref/fate/zlib
Text conflict in tests/ref/fate/zmbv-15bit
Text conflict in tests/ref/fate/zmbv-16bit
Text conflict in tests/ref/fate/zmbv-32bit
Text conflict in tests/ref/fate/zmbv-8bit
Text conflict in tests/ref/lavf/asf
Text conflict in tests/ref/lavf/avi
Text conflict in tests/ref/lavf/dv_fmt
Text conflict in tests/ref/lavf/ffm
Text conflict in tests/ref/lavf/flv_fmt
Text conflict in tests/ref/lavf/gif
Text conflict in tests/ref/lavf/gxf
Text conflict in tests/ref/lavf/mkv
Text conflict in tests/ref/lavf/mov
Text conflict in tests/ref/lavf/mpg
Text conflict in tests/ref/lavf/mxf
Text conflict in tests/ref/lavf/nut
Text conflict in tests/ref/lavf/ogg
Text conflict in tests/ref/lavf/pixfmt
Text conflict in tests/ref/lavf/rm
Text conflict in tests/ref/lavf/ts
Text conflict in tests/ref/lavf/wav
Text conflict in tests/ref/lavfi/crop
Text conflict in tests/ref/lavfi/crop_scale
Text conflict in tests/ref/lavfi/crop_scale_vflip
Text conflict in tests/ref/lavfi/crop_vflip
Text conflict in tests/ref/lavfi/null
Text conflict in tests/ref/lavfi/scale200
Text conflict in tests/ref/lavfi/scale500
Text conflict in tests/ref/lavfi/vflip
Text conflict in tests/ref/lavfi/vflip_crop
Text conflict in tests/ref/lavfi/vflip_vflip
Text conflict in tests/ref/seek/adpcm_yam_wav
Text conflict in tests/ref/seek/dv411_dv
Text conflict in tests/ref/seek/dv50_dv
Text conflict in tests/ref/seek/dv_dv
Text conflict in tests/ref/seek/flac_flac
Text conflict in tests/ref/seek/g726_wav
Text conflict in tests/ref/seek/lavf_asf
Text conflict in tests/ref/seek/lavf_avi
Text conflict in tests/ref/seek/lavf_dv
Text conflict in tests/ref/seek/lavf_ffm
Text conflict in tests/ref/seek/lavf_flv
Text conflict in tests/ref/seek/lavf_gif
Text conflict in tests/ref/seek/lavf_mkv
Text conflict in tests/ref/seek/lavf_mpg
Text conflict in tests/ref/seek/lavf_mxf
Text conflict in tests/ref/seek/lavf_mxf_d10
Text conflict in tests/ref/seek/lavf_nut
Text conflict in tests/ref/seek/lavf_ogg
Text conflict in tests/ref/seek/lavf_rm
Text conflict in tests/ref/seek/lavf_ts
Text conflict in tests/ref/seek/lavf_wav
Text conflict in tests/ref/seek/pcm_alaw_wav
Text conflict in tests/ref/seek/pcm_mulaw_wav
Text conflict in tests/ref/seek/pcm_s16le_wav
Text conflict in tests/ref/seek/pcm_u8_wav
Text conflict in tests/ref/seek/rv20_rm
Text conflict in tests/ref/seek/wmav1_asf
Text conflict in tests/ref/seek/wmav2_asf
Text conflict in tests/ref/vsynth1/dnxhd_1080i
Text conflict in tests/ref/vsynth1/dv
Text conflict in tests/ref/vsynth1/dv50
Text conflict in tests/ref/vsynth1/error
Text conflict in tests/ref/vsynth1/flashsv
Text conflict in tests/ref/vsynth1/huffyuv
Text conflict in tests/ref/vsynth1/jpegls
Text conflict in tests/ref/vsynth1/mpeg2
Text conflict in tests/ref/vsynth1/mpeg2thread
Text conflict in tests/ref/vsynth1/mpeg4
Text conflict in tests/ref/vsynth1/mpeg4adv
Text conflict in tests/ref/vsynth1/rgb
Text conflict in tests/ref/vsynth1/rv20
Text conflict in tests/ref/vsynth1/svq1
Text conflict in tests/ref/vsynth1/yuv
Text conflict in tests/ref/vsynth2/dnxhd_1080i
Text conflict in tests/ref/vsynth2/dv
Text conflict in tests/ref/vsynth2/dv50
Text conflict in tests/ref/vsynth2/error
Text conflict in tests/ref/vsynth2/flashsv
Text conflict in tests/ref/vsynth2/huffyuv
Text conflict in tests/ref/vsynth2/jpegls
Text conflict in tests/ref/vsynth2/mpeg2
Text conflict in tests/ref/vsynth2/mpeg2thread
Text conflict in tests/ref/vsynth2/mpeg4
Text conflict in tests/ref/vsynth2/mpeg4adv
Text conflict in tests/ref/vsynth2/rgb
Text conflict in tests/ref/vsynth2/rv20
Text conflict in tests/ref/vsynth2/svq1
Text conflict in tests/ref/vsynth2/yuv
Text conflict in tests/regression-funcs.sh
Text conflict in tests/rotozoom.c
Text conflict in tests/tiny_psnr.c
Text conflict in tests/videogen.c
Text conflict in tools/clean-diff
Text conflict in tools/cws2fws.c
Text conflict in tools/graph2dot.c
Text conflict in tools/lavfi-showfiltfmts.c
Text conflict in tools/patcheck
Text conflict in tools/pktdumper.c
Text conflict in tools/probetest.c
Text conflict in tools/qt-faststart.c
Text conflict in tools/trasher.c
Text conflict in version.sh
1456 conflicts encountered.
bzr: ERROR: bzrlib.errors.BzrCommandError: Conflicts from merge

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 946, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1150, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 699, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 721, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builder/cmds.py", line 645, in run
    build_tree(base_branch, working_directory)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builder/recipe.py", line 709, in build_tree
    possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builder/recipe.py", line 686, in _build_inner_tree
    instruction.apply(target_path, tree_to, br_to)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builder/recipe.py", line 769, in apply
    possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/builder/recipe.py", line 527, in merge_branch
    raise errors.BzrCommandError("Conflicts from merge")
BzrCommandError: Conflicts from merge
(753.075064, 1.6401019999999999, 0, 0, 0, 0, 70498, 27, 0, 8256, 229584, 0, 0, 0, 12067, 3713)
RUN: /usr/share/launchpad-buildd/slavebin/scan-for-processes ['/usr/share/launchpad-buildd/slavebin/scan-for-processes', '7687068254b8a8d0507b1ac290032896f0bc91cc']
Scanning for processes to kill in build /home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild...
RUN: /usr/share/launchpad-buildd/slavebin/umount-chroot ['umount-chroot', '7687068254b8a8d0507b1ac290032896f0bc91cc']
Unmounting chroot for build 7687068254b8a8d0507b1ac290032896f0bc91cc...
none /home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/proc proc rw,relatime 0 0
none /home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/dev/pts devpts rw,relatime 0 0
none /home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/sys sysfs rw,relatime 0 0
none /home/buildd/build-7687068254b8a8d0507b1ac290032896f0bc91cc/chroot-autobuild/dev/shm tmpfs rw,relatime 0 0
RUN: /usr/share/launchpad-buildd/slavebin/remove-build ['remove-build', '7687068254b8a8d0507b1ac290032896f0bc91cc']
Removing build 7687068254b8a8d0507b1ac290032896f0bc91cc