diff -Nru libav-0.8.3/debian/changelog libav-0.8.3/debian/changelog
--- libav-0.8.3/debian/changelog	2012-06-12 08:16:52.000000000 -0600
+++ libav-0.8.3/debian/changelog	2012-07-30 14:08:52.000000000 -0600
@@ -1,3 +1,10 @@
+libav (4:0.8.3-0ubuntu0.12.04.2) precise-proposed; 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@novacut.com>  Mon, 30 Jul 2012 13:50:01 -0600
+
 libav (4:0.8.3-0ubuntu0.12.04.1) precise-security; urgency=low
 
   * Update to 0.8.3 to fix multiple security issues. (LP: #1012132)
diff -Nru libav-0.8.3/debian/patches/05-H264-AVCodecContext-cropping.patch libav-0.8.3/debian/patches/05-H264-AVCodecContext-cropping.patch
--- libav-0.8.3/debian/patches/05-H264-AVCodecContext-cropping.patch	1969-12-31 17:00:00.000000000 -0700
+++ libav-0.8.3/debian/patches/05-H264-AVCodecContext-cropping.patch	2012-07-30 13:39:55.000000000 -0600
@@ -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 -Nru libav-0.8.3/debian/patches/series libav-0.8.3/debian/patches/series
--- libav-0.8.3/debian/patches/series	2012-06-10 13:32:40.000000000 -0600
+++ libav-0.8.3/debian/patches/series	2012-07-30 13:34:59.000000000 -0600
@@ -1,3 +1,4 @@
 01-Tweak-doxygen-config.patch
 03-disable-configuration-warnings.patch
 04-ffmpeg-warning-change.patch
+05-H264-AVCodecContext-cropping.patch