[SCM] libav/ubuntu: Imported Debian patch 4:0.8.3-0ubuntu3

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 57fbd35b6893b284d854c843a836621cc8831ea6
Author: Jason Gerard DeRose <jderose at novacut.com>
Date:   Mon Jul 30 14:55:29 2012 -0600

    Imported Debian patch 4:0.8.3-0ubuntu3

diff --git a/debian/changelog b/debian/changelog
index eabdfa5..b46ca1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libav (4:0.8.3-0ubuntu3) quantal; urgency=low
+
+  * debian/patches/05-H264-AVCodecContext-cropping.patch: Added patch from
+    Måns Rullgård to fix H264 video size from Canon DSLR cameras (LP: #937561)
+
+ -- Jason Gerard DeRose <jderose at novacut.com>  Mon, 30 Jul 2012 14:55:29 -0600
+
 libav (4:0.8.3-0ubuntu2) quantal; urgency=low
 
   * debian/control:
diff --git a/debian/patches/05-H264-AVCodecContext-cropping.patch b/debian/patches/05-H264-AVCodecContext-cropping.patch
new file mode 100644
index 0000000..76fcb9d
--- /dev/null
+++ b/debian/patches/05-H264-AVCodecContext-cropping.patch
@@ -0,0 +1,17 @@
+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/patches/series b/debian/patches/series
index 66758ef..37e3bda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-Tweak-doxygen-config.patch
 03-disable-configuration-warnings.patch
 04-ffmpeg-warning-change.patch
+05-H264-AVCodecContext-cropping.patch

-- 
Libav/FFmpeg packaging