Merge lp:~jderose/ubuntu/quantal/libav/fix-937561-q into lp:ubuntu/quantal/libav

[Jason Gerard DeRose]

This adds debian/patches/05-H264-AVCodecContext-cropping.patch, which is based on Måns Rullgård's fix here:

http://git.libav.org/?p=libav.git;a=commit;h=30f515091c323da59c0f1b533703dedca2f4b95d

This fix will be included in the next libav 0.8 series release, but that may not happen in time for Quantal.

[Mans Rullgard (mansr)]

This one is also needed: http://git.libav.org/?p=libav.git;a=commit;h=8aa93e900449c88c3169ff5636fed03f41779cac

[Jason Gerard DeRose (jderose)]

Mans, okay, thanks!

[Jason Gerard DeRose (jderose)]

Mans, so I'm having a harder time understanding that 2nd patch. Do you think that is safe to push out in a stable release update?

Can you think of any side effects that 2nd patch might have?

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-17 14:04:07 +0000
+++ debian/changelog	2012-07-30 21:01:21 +0000
@@ -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 <[e-mail]>  Mon, 30 Jul 2012 14:55:29 -0600
+
 libav (4:0.8.3-0ubuntu2) quantal; urgency=low
 
   * debian/control:

=== added file 'debian/patches/05-H264-AVCodecContext-cropping.patch'
--- debian/patches/05-H264-AVCodecContext-cropping.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05-H264-AVCodecContext-cropping.patch	2012-07-30 21:01:21 +0000
@@ -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))) {

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-05-13 13:07:30 +0000
+++ debian/patches/series	2012-07-30 21:01:21 +0000
@@ -1,3 +1,4 @@
 01-Tweak-doxygen-config.patch
 03-disable-configuration-warnings.patch
 04-ffmpeg-warning-change.patch
+05-H264-AVCodecContext-cropping.patch