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

Proposed by Jason Gerard DeRose on 2012-07-30
Status: Merged
Merged at revision: 24
Proposed branch: lp:~jderose/ubuntu/quantal/libav/fix-937561-q
Merge into: lp:ubuntu/quantal/libav
Diff against target: 45 lines (+25/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/05-H264-AVCodecContext-cropping.patch (+17/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~jderose/ubuntu/quantal/libav/fix-937561-q
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-07-30 Pending
Review via email: mp+117341@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Jason Gerard DeRose (jderose) wrote :

Mans, okay, thanks!

Jason Gerard DeRose (jderose) wrote :

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?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-07-17 14:04:07 +0000
3+++ debian/changelog 2012-07-30 21:01:21 +0000
4@@ -1,3 +1,10 @@
5+libav (4:0.8.3-0ubuntu3) quantal; urgency=low
6+
7+ * debian/patches/05-H264-AVCodecContext-cropping.patch: Added patch from
8+ Måns Rullgård to fix H264 video size from Canon DSLR cameras (LP: #937561)
9+
10+ -- Jason Gerard DeRose <jderose@novacut.com> Mon, 30 Jul 2012 14:55:29 -0600
11+
12 libav (4:0.8.3-0ubuntu2) quantal; urgency=low
13
14 * debian/control:
15
16=== added file 'debian/patches/05-H264-AVCodecContext-cropping.patch'
17--- debian/patches/05-H264-AVCodecContext-cropping.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/05-H264-AVCodecContext-cropping.patch 2012-07-30 21:01:21 +0000
19@@ -0,0 +1,17 @@
20+Index: fix-937561/libavcodec/h264.c
21+===================================================================
22+--- fix-937561.orig/libavcodec/h264.c 2012-07-30 13:30:47.554827000 -0600
23++++ fix-937561/libavcodec/h264.c 2012-07-30 13:38:44.602156171 -0600
24+@@ -2720,6 +2720,12 @@
25+ else
26+ s->height= 16*s->mb_height - (2<<s->chroma_y_shift)*FFMIN(h->sps.crop_bottom, (16>>s->chroma_y_shift)-1);
27+
28++ if (FFALIGN(s->avctx->width, 16) == s->width &&
29++ FFALIGN(s->avctx->height, 16) == s->height) {
30++ s->width = s->avctx->width;
31++ s->height = s->avctx->height;
32++ }
33++
34+ if (s->context_initialized
35+ && ( s->width != s->avctx->width || s->height != s->avctx->height
36+ || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
37
38=== modified file 'debian/patches/series'
39--- debian/patches/series 2012-05-13 13:07:30 +0000
40+++ debian/patches/series 2012-07-30 21:01:21 +0000
41@@ -1,3 +1,4 @@
42 01-Tweak-doxygen-config.patch
43 03-disable-configuration-warnings.patch
44 04-ffmpeg-warning-change.patch
45+05-H264-AVCodecContext-cropping.patch

Subscribers

People subscribed via source and target branches