← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/post-0.7.1/0020-aacps-skip-some-memcpy-if-src-and-dst-would-be-equal.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-10-01 00:22:07 UTC
  • mfrom: (1.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20111001002207-tnxz39i0rwr5ufy9
Tags: 4:0.7.2-1ubuntu1
* Merge from debian, remaining changes:
  - don't build against libfaad, libdirac, librtmp and libopenjpeg,
    lame, xvid, x264  (all in universe)
  - not installing into multiarch directories
* This new upstream release has basically merged in all 70 patches that
  are present in 4:0.7.1-7ubuntu2, plus some additional, similarily
  focused ones.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/post-0.7.1/0020-aacps-skip-some-memcpy-if-src-and-dst-would-be-equal.patch
1
 
From f7831bb104c48118b38d4ba86a7d594fe4fa0f2c Mon Sep 17 00:00:00 2001
2
 
From: Mans Rullgard <mans@mansr.com>
3
 
Date: Fri, 15 Jul 2011 22:38:10 +0100
4
 
Subject: [PATCH 20/70] aacps: skip some memcpy() if src and dst would be equal
5
 
 
6
 
Signed-off-by: Mans Rullgard <mans@mansr.com>
7
 
(cherry picked from commit e5902d60ce8f7cf10b6e87a57eec536b316261a3)
8
 
 
9
 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10
 
---
11
 
 libavcodec/aacps.c |   19 +++++++++++--------
12
 
 1 files changed, 11 insertions(+), 8 deletions(-)
13
 
 
14
 
diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
15
 
index 724c132..3f1424b 100644
16
 
--- a/libavcodec/aacps.c
17
 
+++ b/libavcodec/aacps.c
18
 
@@ -813,14 +813,17 @@ static void stereo_processing(PSContext *ps, float (*l)[32][2], float (*r)[32][2
19
 
     const float (*H_LUT)[8][4] = (PS_BASELINE || ps->icc_mode < 3) ? HA : HB;
20
 
 
21
 
     //Remapping
22
 
-    memcpy(H11[0][0], H11[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H11[0][0][0]));
23
 
-    memcpy(H11[1][0], H11[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H11[1][0][0]));
24
 
-    memcpy(H12[0][0], H12[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H12[0][0][0]));
25
 
-    memcpy(H12[1][0], H12[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H12[1][0][0]));
26
 
-    memcpy(H21[0][0], H21[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H21[0][0][0]));
27
 
-    memcpy(H21[1][0], H21[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H21[1][0][0]));
28
 
-    memcpy(H22[0][0], H22[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H22[0][0][0]));
29
 
-    memcpy(H22[1][0], H22[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H22[1][0][0]));
30
 
+    if (ps->num_env_old) {
31
 
+        memcpy(H11[0][0], H11[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H11[0][0][0]));
32
 
+        memcpy(H11[1][0], H11[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H11[1][0][0]));
33
 
+        memcpy(H12[0][0], H12[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H12[0][0][0]));
34
 
+        memcpy(H12[1][0], H12[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H12[1][0][0]));
35
 
+        memcpy(H21[0][0], H21[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H21[0][0][0]));
36
 
+        memcpy(H21[1][0], H21[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H21[1][0][0]));
37
 
+        memcpy(H22[0][0], H22[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H22[0][0][0]));
38
 
+        memcpy(H22[1][0], H22[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H22[1][0][0]));
39
 
+    }
40
 
+
41
 
     if (is34) {
42
 
         remap34(&iid_mapped, ps->iid_par, ps->nr_iid_par, ps->num_env, 1);
43
 
         remap34(&icc_mapped, ps->icc_par, ps->nr_icc_par, ps->num_env, 1);
44
 
1.7.4.1
45