~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to debian/patches/post-0.7.1/0048-indeo2-init_get_bits-size-in-bits-instead-of-bytes.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-09-28 09:18:34 UTC
  • mfrom: (1.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20110928091834-w415mnuh06h4zpvc
Tags: 4:0.7.1-7ubuntu2
Revert "Convert package to include multiarch support."

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From af32fa929a81188c4c451f8648f2f650dcf5228a Mon Sep 17 00:00:00 2001
 
2
From: Alex Converse <alex.converse@gmail.com>
 
3
Date: Fri, 9 Sep 2011 13:24:19 -0700
 
4
Subject: [PATCH 48/70] indeo2: init_get_bits size in bits instead of bytes
 
5
 
 
6
(cherry picked from commit 68ca330cbd479111db9cb7649d7530ad59f04cc8)
 
7
 
 
8
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 
9
---
 
10
 libavcodec/indeo2.c |    2 +-
 
11
 1 files changed, 1 insertions(+), 1 deletions(-)
 
12
 
 
13
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
 
14
index 0e588c3..6cf893b 100644
 
15
--- a/libavcodec/indeo2.c
 
16
+++ b/libavcodec/indeo2.c
 
17
@@ -165,7 +165,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
 
18
 #endif
 
19
     start = 48; /* hardcoded for now */
 
20
 
 
21
-    init_get_bits(&s->gb, buf + start, buf_size - start);
 
22
+    init_get_bits(&s->gb, buf + start, (buf_size - start) * 8);
 
23
 
 
24
     if (s->decode_delta) { /* intraframe */
 
25
         ir2_decode_plane(s, avctx->width, avctx->height,
 
26
-- 
 
27
1.7.4.1
 
28