diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/debian/changelog phonon-backend-vlc-0.2.1~git20100916~ppa1/debian/changelog --- phonon-backend-vlc-0.2.1~git20100914~ppa1/debian/changelog 2010-09-13 22:38:11.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/debian/changelog 2010-09-16 20:06:45.000000000 +0000 @@ -1,5 +1,5 @@ -phonon-backend-vlc (0.2.1~git20100914~ppa1) lucid; urgency=low +phonon-backend-vlc (0.2.1~git20100916~ppa1) lucid; urgency=low * New GIT snapshot - -- Emanuele Tue, 14 September 2010 00:00:00 +0200 + -- Emanuele Thu, 16 September 2010 00:00:00 +0200 diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/FETCH_HEAD phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/FETCH_HEAD --- phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/FETCH_HEAD 2010-09-13 22:38:11.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/FETCH_HEAD 2010-09-16 20:06:45.000000000 +0000 @@ -1 +1 @@ -3f1769ae24abe86a45298b3b8969db8c9f177d3d branch 'master' of git://gitorious.org/phonon/phonon-vlc +674ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f branch 'master' of git://gitorious.org/phonon/phonon-vlc Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/index and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/index differ diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/logs/HEAD phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/logs/HEAD --- phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/logs/HEAD 2010-09-13 11:03:44.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/logs/HEAD 2010-09-16 20:06:45.000000000 +0000 @@ -8,3 +8,4 @@ 5e49d2495c87c6e48c9a5c173f44951502818591 88fb405d16806dac8e2c537d40931e4bea6cfdd0 Emanuele Tartaglia 1281307150 +0200 pull : Fast-forward 88fb405d16806dac8e2c537d40931e4bea6cfdd0 9cdcab67b75438c5f7a91f89d468ce3259d0138f Emanuele Tartaglia 1283152312 +0200 pull : Fast-forward 9cdcab67b75438c5f7a91f89d468ce3259d0138f 3f1769ae24abe86a45298b3b8969db8c9f177d3d Emanuele Tartaglia 1284375824 +0200 pull : Fast-forward +3f1769ae24abe86a45298b3b8969db8c9f177d3d 674ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f Emanuele Tartaglia 1284667605 +0200 pull : Fast-forward diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/logs/refs/heads/master phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/logs/refs/heads/master --- phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/logs/refs/heads/master 2010-09-13 11:03:44.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/logs/refs/heads/master 2010-09-16 20:06:45.000000000 +0000 @@ -8,3 +8,4 @@ 5e49d2495c87c6e48c9a5c173f44951502818591 88fb405d16806dac8e2c537d40931e4bea6cfdd0 Emanuele Tartaglia 1281307150 +0200 pull : Fast-forward 88fb405d16806dac8e2c537d40931e4bea6cfdd0 9cdcab67b75438c5f7a91f89d468ce3259d0138f Emanuele Tartaglia 1283152312 +0200 pull : Fast-forward 9cdcab67b75438c5f7a91f89d468ce3259d0138f 3f1769ae24abe86a45298b3b8969db8c9f177d3d Emanuele Tartaglia 1284375824 +0200 pull : Fast-forward +3f1769ae24abe86a45298b3b8969db8c9f177d3d 674ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f Emanuele Tartaglia 1284667605 +0200 pull : Fast-forward diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/logs/refs/remotes/origin/master phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/logs/refs/remotes/origin/master --- phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/logs/refs/remotes/origin/master 2010-09-13 11:03:44.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/logs/refs/remotes/origin/master 2010-09-16 20:06:45.000000000 +0000 @@ -7,3 +7,4 @@ 5e49d2495c87c6e48c9a5c173f44951502818591 88fb405d16806dac8e2c537d40931e4bea6cfdd0 Emanuele Tartaglia 1281307150 +0200 pull : fast-forward 88fb405d16806dac8e2c537d40931e4bea6cfdd0 9cdcab67b75438c5f7a91f89d468ce3259d0138f Emanuele Tartaglia 1283152312 +0200 pull : fast-forward 9cdcab67b75438c5f7a91f89d468ce3259d0138f 3f1769ae24abe86a45298b3b8969db8c9f177d3d Emanuele Tartaglia 1284375824 +0200 pull : fast-forward +3f1769ae24abe86a45298b3b8969db8c9f177d3d 674ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f Emanuele Tartaglia 1284667605 +0200 pull : fast-forward Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/28/0cccadc04631dc002a3c0e569fc948902a7cab and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/28/0cccadc04631dc002a3c0e569fc948902a7cab differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/67/4ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/67/4ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/89/66a1f0412233755a05016bb0768eeedb96dbc2 and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/89/66a1f0412233755a05016bb0768eeedb96dbc2 differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/9d/b210dbbced8e6efde213203302fcb7f681383f and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/9d/b210dbbced8e6efde213203302fcb7f681383f differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/aa/1a2e629c4c7964664db2eec8ad5bb694efaaf9 and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/aa/1a2e629c4c7964664db2eec8ad5bb694efaaf9 differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/ba/a3340fa3023c7b35fbe092b4438eb0a357ca5a and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/ba/a3340fa3023c7b35fbe092b4438eb0a357ca5a differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/ed/2921fbc49b02baf15f2c85c6ffa9a4674577c4 and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/ed/2921fbc49b02baf15f2c85c6ffa9a4674577c4 differ Binary files /tmp/7c01DvKVHc/phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/objects/f1/e7a4552c025d4dcea29c542cf23353acce6e10 and /tmp/CUfA2pjsfs/phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/objects/f1/e7a4552c025d4dcea29c542cf23353acce6e10 differ diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/refs/heads/master phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/refs/heads/master --- phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/refs/heads/master 2010-09-13 11:03:44.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/refs/heads/master 2010-09-16 20:06:45.000000000 +0000 @@ -1 +1 @@ -3f1769ae24abe86a45298b3b8969db8c9f177d3d +674ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/refs/remotes/origin/master phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/refs/remotes/origin/master --- phonon-backend-vlc-0.2.1~git20100914~ppa1/.git/refs/remotes/origin/master 2010-09-13 11:03:44.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/.git/refs/remotes/origin/master 2010-09-16 20:06:45.000000000 +0000 @@ -1 +1 @@ -3f1769ae24abe86a45298b3b8969db8c9f177d3d +674ef502b1f1dc27d1a0d0e15b75bab6b3a0c39f diff -Nru phonon-backend-vlc-0.2.1~git20100914~ppa1/vlc/videowidget.cpp phonon-backend-vlc-0.2.1~git20100916~ppa1/vlc/videowidget.cpp --- phonon-backend-vlc-0.2.1~git20100914~ppa1/vlc/videowidget.cpp 2010-09-13 11:03:44.000000000 +0000 +++ phonon-backend-vlc-0.2.1~git20100916~ppa1/vlc/videowidget.cpp 2010-09-16 20:06:45.000000000 +0000 @@ -349,6 +349,7 @@ VideoWidget *cw = (VideoWidget *)data; cw->m_locker.lock(); *bufRet = cw->m_img->bits(); + return NULL; // Picture identifier, not needed here. } void VideoWidget::unlock(void *data, void *id, void *const *pixels)