← 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/0023-rv30-return-AVERROR-EINVAL-instead-of-EINVAL.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/0023-rv30-return-AVERROR-EINVAL-instead-of-EINVAL.patch
1
 
From 44c718cf7116203e4e86ff2b92d7dcfd9c77e4b3 Mon Sep 17 00:00:00 2001
2
 
From: Diego Biurrun <diego@biurrun.de>
3
 
Date: Thu, 21 Jul 2011 14:25:01 +0200
4
 
Subject: [PATCH 23/70] rv30: return AVERROR(EINVAL) instead of EINVAL
5
 
 
6
 
On some platforms EINVAL could be positive, ensure we return negative values.
7
 
(cherry picked from commit e5985185d2eda942333ebbb72bd7d043ffe40be7)
8
 
 
9
 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10
 
---
11
 
 libavcodec/rv30.c |    2 +-
12
 
 1 files changed, 1 insertions(+), 1 deletions(-)
13
 
 
14
 
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
15
 
index 2b423cc..b7f43a4 100644
16
 
--- a/libavcodec/rv30.c
17
 
+++ b/libavcodec/rv30.c
18
 
@@ -256,7 +256,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
19
 
     if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){
20
 
         av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n",
21
 
                6 + r->rpr * 2, avctx->extradata_size);
22
 
-        return EINVAL;
23
 
+        return AVERROR(EINVAL);
24
 
     }
25
 
     r->parse_slice_header = rv30_parse_slice_header;
26
 
     r->decode_intra_types = rv30_decode_intra_types;
27
 
1.7.4.1
28