← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/mlib/dsputil_mlib.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/mlib/dsputil_mlib.c
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
22
 
#include "../dsputil.h"
23
 
#include "../mpegvideo.h"
 
22
#include "dsputil.h"
 
23
#include "mpegvideo.h"
24
24
 
25
25
#include <mlib_types.h>
26
26
#include <mlib_status.h>
374
374
 
375
375
/* swap byte order of a buffer */
376
376
 
377
 
static void bswap_buf_mlib(uint32_t *dst, uint32_t *src, int w)
 
377
static void bswap_buf_mlib(uint32_t *dst, const uint32_t *src, int w)
378
378
{
379
379
  mlib_VectorReverseByteOrder_U32_U32(dst, src, w);
380
380
}
455
455
        s->dsp.fdct = ff_fdct_mlib;
456
456
    }
457
457
 
458
 
    if(s->avctx->idct_algo==FF_IDCT_AUTO || s->avctx->idct_algo==FF_IDCT_MLIB){
 
458
    if(s->avctx->idct_algo==FF_IDCT_MLIB){
459
459
        s->dsp.idct_put= ff_idct_put_mlib;
460
460
        s->dsp.idct_add= ff_idct_add_mlib;
461
461
        s->dsp.idct    = ff_idct_mlib;