← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/ps2/mpegvideo_mmi.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/ps2/mpegvideo_mmi.c
1
1
/*
2
2
 * Copyright (c) 2000,2001 Fabrice Bellard.
3
3
 *
 
4
 * MMI optimization by Leon van Stuivenberg
 
5
 *
4
6
 * This file is part of FFmpeg.
5
7
 *
6
8
 * FFmpeg is free software; you can redistribute it and/or
16
18
 * You should have received a copy of the GNU Lesser General Public
17
19
 * License along with FFmpeg; if not, write to the Free Software
18
20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
 
 *
20
 
 * MMI optimization by Leon van Stuivenberg
21
21
 */
22
22
 
23
 
#include "../dsputil.h"
24
 
#include "../mpegvideo.h"
25
 
#include "../avcodec.h"
 
23
#include "dsputil.h"
 
24
#include "mpegvideo.h"
 
25
#include "avcodec.h"
26
26
 
27
27
static void dct_unquantize_h263_mmi(MpegEncContext *s,
28
28
                                  DCTELEM *block, int n, int qscale)
45
45
            qadd = 0;
46
46
            level = block[0];
47
47
        }
48
 
        nCoeffs= 63; //does not allways use zigzag table
 
48
        nCoeffs= 63; //does not always use zigzag table
49
49
    } else {
50
50
        nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ];
51
51
    }