[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-1-15-ge0c3787

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit e0c37878969a458fd81265d3dca054f4d50e35bb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 28 23:15:46 2010 +0200

    Add VP80 fourcc to libavformat/riff.c

diff --git a/debian/patches/0001-Add-VP80-fourcc.patch b/debian/patches/0001-Add-VP80-fourcc.patch
new file mode 100644
index 0000000..d27c109
--- /dev/null
+++ b/debian/patches/0001-Add-VP80-fourcc.patch
@@ -0,0 +1,24 @@
+From: Reinhard Tartler <siretart at tauware.de>
+Date: Mon, 28 Jun 2010 23:12:40 +0200
+Subject: [PATCH] Add VP80 fourcc
+
+Patch by Google
+
+backport r23193 by conrad
+---
+ libavformat/riff.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libavformat/riff.c b/libavformat/riff.c
+index 04b7108..64464ca 100644
+--- a/libavformat/riff.c
++++ b/libavformat/riff.c
+@@ -183,6 +183,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
+     { CODEC_ID_VP6,          MKTAG('V', 'P', '6', '2') },
+     { CODEC_ID_VP6F,         MKTAG('V', 'P', '6', 'F') },
+     { CODEC_ID_VP6F,         MKTAG('F', 'L', 'V', '4') },
++    { CODEC_ID_VP8,          MKTAG('V', 'P', '8', '0') },
+     { CODEC_ID_ASV1,         MKTAG('A', 'S', 'V', '1') },
+     { CODEC_ID_ASV2,         MKTAG('A', 'S', 'V', '2') },
+     { CODEC_ID_VCR1,         MKTAG('V', 'C', 'R', '1') },
+-- 
diff --git a/debian/patches/0001-Tune-doxygen-config.patch b/debian/patches/0002-Tweak-doxygen-config.patch
similarity index 90%
rename from debian/patches/0001-Tune-doxygen-config.patch
rename to debian/patches/0002-Tweak-doxygen-config.patch
index a74f13c..0b719af 100644
--- a/debian/patches/0001-Tune-doxygen-config.patch
+++ b/debian/patches/0002-Tweak-doxygen-config.patch
@@ -3,6 +3,9 @@ Date: Mon, 28 Jun 2010 22:43:55 +0200
 Subject: [PATCH] Tweak doxygen config
 
 exclude some directories we use for packaging from doxygen documentation
+---
+ Doxyfile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/Doxyfile b/Doxyfile
 index ee233b9..1251d34 100644
@@ -17,3 +20,4 @@ index ee233b9..1251d34 100644
  
  # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
  # that are symbolic links (a Unix filesystem feature) are excluded from the input.
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 2953c7e..8105776 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001-Tune-doxygen-config.patch
+0001-Add-VP80-fourcc.patch
+0002-Tweak-doxygen-config.patch

-- 
FFmpeg packaging