← Back to branch summary

~ubuntu-branches/debian/wheezy/vlc/wheezy

« back to all changes in this revision

Viewing changes to modules/codec/avcodec/avcodec.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung, Benjamin Drung, Reinhard Tartler
  • Date: 2011-06-11 19:32:24 UTC
  • mfrom: (1.3.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20110611193224-dcd1xbsw8d7or72y
Tags: 1.1.10-1
https://launchpad.net/bugs/795410
http://bugs.debian.org/622879
https://launchpad.net/bugs/737192
https://launchpad.net/bugs/769463
http://bugs.debian.org/622935
https://launchpad.net/bugs/743323
https://launchpad.net/bugs/754497
https://launchpad.net/bugs/785979
https://launchpad.net/bugs/664030
https://launchpad.net/bugs/722690
http://bugs.debian.org/629619
http://bugs.debian.org/488771
[ Benjamin Drung ]
* New upstream release.
  - Security: Fix XSPF integer overflow (CVE-2011-2194) (LP: #795410)
  - Improve .desktop file:
    - Add smb as supported protocol (Closes: #622879, LP: #737192)
    - add video/webm to supported MIME formats (LP: #769463)
  - Fix libdvdread errors while playing ogg files (Closes: #622935)
  - Support three channels in pulseaudio output plugin (LP: 743478)
  - PulseAudio output re-written due to unstability of the current one
    (LP: #743323)
  - Fix crashes (LP: #754497, #785979)
  - Qt: allow drag and drop of any URL, not just a local file (LP: #664030)
  - Fix libvlcplugin.so: undefined symbol: NPP_Initialize (LP: #722690)
* Refresh patches.
* Drop as-needed patch due to autoreconf run.
* Backport PulseAudio build fix.
* Add GNOME MIME types for Ogg Vorbis and Ogg Theora (Closes: #629619).
* Mention potcast support in package description (Closes: #488771).

[ Reinhard Tartler ]
* run autoreconf on the buildds
* Weaken dependencies on libschroedinger

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/codec/avcodec/avcodec.c
2
2
 * avcodec.c: video and audio decoder and encoder using libavcodec
3
3
 *****************************************************************************
4
4
 * Copyright (C) 1999-2008 the VideoLAN team
5
 
 * $Id: 7313a9b503291939af63bb02bd9eb16b2560841b $
 
5
 * $Id: f987fb873b289b7c8a10fa87151815396ae5ac50 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Gildas Bazin <gbazin@videolan.org>
262
262
    p_context->dsp_mask = 0;
263
263
    if( !(i_cpu & CPU_CAPABILITY_MMX) )
264
264
    {
265
 
        p_context->dsp_mask |= FF_MM_MMX;
 
265
        p_context->dsp_mask |= AV_CPU_FLAG_MMX;
266
266
    }
267
267
    if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
268
268
    {
269
 
        p_context->dsp_mask |= FF_MM_MMXEXT;
 
269
        p_context->dsp_mask |= AV_CPU_FLAG_MMX2;
270
270
    }
271
271
    if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
272
272
    {
273
 
        p_context->dsp_mask |= FF_MM_3DNOW;
 
273
        p_context->dsp_mask |= AV_CPU_FLAG_3DNOW;
274
274
    }
275
275
    if( !(i_cpu & CPU_CAPABILITY_SSE) )
276
276
    {
277
 
        p_context->dsp_mask |= FF_MM_SSE;
 
277
        p_context->dsp_mask |= AV_CPU_FLAG_SSE;
278
278
    }
279
279
    if( !(i_cpu & CPU_CAPABILITY_SSE2) )
280
280
    {
281
 
        p_context->dsp_mask |= FF_MM_SSE2;
 
281
        p_context->dsp_mask |= AV_CPU_FLAG_SSE2;
282
282
    }
283
 
#ifdef FF_MM_SSE3
 
283
#ifdef AV_CPU_FLAG_SSE3
284
284
    if( !(i_cpu & CPU_CAPABILITY_SSE3) )
285
 
        p_context->dsp_mask |= FF_MM_SSE3;
 
285
        p_context->dsp_mask |= AV_CPU_FLAG_SSE3;
286
286
#endif
287
 
#ifdef FF_MM_SSSE3
 
287
#ifdef AV_CPU_FLAG_SSSE3
288
288
    if( !(i_cpu & CPU_CAPABILITY_SSSE3) )
289
 
        p_context->dsp_mask |= FF_MM_SSSE3;
 
289
        p_context->dsp_mask |= AV_CPU_FLAG_SSSE3;
290
290
#endif
291
 
#ifdef FF_MM_SSE4
 
291
#ifdef AV_CPU_FLAG_SSE4
292
292
    if( !(i_cpu & CPU_CAPABILITY_SSE4_1) )
293
 
        p_context->dsp_mask |= FF_MM_SSE4;
 
293
        p_context->dsp_mask |= AV_CPU_FLAG_SSE4;
294
294
#endif
295
 
#ifdef FF_MM_SSE42
 
295
#ifdef AV_CPU_FLAG_SSE42
296
296
    if( !(i_cpu & CPU_CAPABILITY_SSE4_2) )
297
 
        p_context->dsp_mask |= FF_MM_SSE42;
 
297
        p_context->dsp_mask |= AV_CPU_FLAG_SSE42;
298
298
#endif
299
299
 
300
300
    p_dec->b_need_packetized = true;