[SCM] libav/ubuntu: minimize changes to debian

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 19094e65b66114e46fa016270f7e35ab9ceb1b3b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 7 22:54:37 2012 +0200

    minimize changes to debian

diff --git a/.gitignore b/.gitignore
index 2118a51..f420dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ tools/probetest
 tools/qt-faststart
 tools/trasher
 version.h
+/.pc
diff --git a/debian/patches/05-H264-AVCodecContext-cropping.patch b/debian/patches/05-H264-AVCodecContext-cropping.patch
deleted file mode 100644
index 76fcb9d..0000000
--- a/debian/patches/05-H264-AVCodecContext-cropping.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: fix-937561/libavcodec/h264.c
-===================================================================
---- fix-937561.orig/libavcodec/h264.c	2012-07-30 13:30:47.554827000 -0600
-+++ fix-937561/libavcodec/h264.c	2012-07-30 13:38:44.602156171 -0600
-@@ -2720,6 +2720,12 @@
-     else
-         s->height= 16*s->mb_height - (2<<s->chroma_y_shift)*FFMIN(h->sps.crop_bottom, (16>>s->chroma_y_shift)-1);
- 
-+    if (FFALIGN(s->avctx->width,  16) == s->width &&
-+        FFALIGN(s->avctx->height, 16) == s->height) {
-+        s->width  = s->avctx->width;
-+        s->height = s->avctx->height;
-+    }
-+
-     if (s->context_initialized
-         && (   s->width != s->avctx->width || s->height != s->avctx->height
-             || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

-- 
Libav/FFmpeg packaging