← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vlc/maverick

« back to all changes in this revision

Viewing changes to modules/codec/ffmpeg/mux.c

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, Martin Hamrle
  • Date: 2008-03-25 20:08:07 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20080325200807-64amsvla1tnnen5s
Tags: 0.8.6.release.e+x264svn20071224+faad2.6.1-0ubuntu1
https://launchpad.net/bugs/206918
https://launchpad.net/bugs/196452
https://launchpad.net/bugs/196417
https://launchpad.net/bugs/204050
[ Mario Limonciello ]
* New upstream version. (LP: #206918)
  - New versioning scheme to bring attention to the fact that
    faad and x264 are in the .orig.tar.gz.
  - Fixes 6 CVEs (LP: #196452)
    + CVE: 2007-6681
    + CVE: 2007-6682
    + CVE: 2007-6683
    + CVE: 2008-0295
    + CVE: 2008-0296
* Drop 021_CVE-2008-0984 as it's included upstream.
* debian/rules:
  - Adjust items touched for faad2 when building.
  - Apply all faad2 patches when building
* debian/control:
  - Add dpatch, libfaad-dev, and autotools-dev to build-depends to allow 
    faad2 to build again.
  - Add automake, cvs, and libtool to build depends (now needed for building VLC)

[ Martin Hamrle ]
 * Add new package with pulse output plugin (LP: #196417)
   - debian/patches/030_pulse.diff:
     + patch from upstream trunk to support pulseaudio output
   - debian/rules:
     + enable pulseaudio
   - debian/control:
     + add dependencies to libpulse-dev
     + new package description
   - Creates a NEW binary package, requiring FFe (LP: #204050)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/codec/ffmpeg/mux.c
2
2
 * mux.c: muxer using ffmpeg (libavformat).
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2006 the VideoLAN team
5
 
 * $Id: mux.c 16603 2006-09-10 20:40:21Z sam $
 
5
 * $Id: mux.c 23927 2007-12-29 12:17:38Z jpsaman $
6
6
 *
7
7
 * Authors: Gildas Bazin <gbazin@videolan.org>
8
8
 *
132
132
        free( p_sys );
133
133
        return VLC_EGENERIC;
134
134
    }
135
 
 
 
135
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
 
136
    p_sys->oc->pb = &p_sys->io;
 
137
#else
136
138
    p_sys->oc->pb = p_sys->io;
 
139
#endif
137
140
    p_sys->oc->nb_streams = 0;
138
141
 
139
142
    p_sys->b_write_header = VLC_TRUE;
348
351
    {
349
352
        msg_Dbg( p_mux, "writing header" );
350
353
 
351
 
        p_sys->b_write_header = VLC_FALSE;
352
 
 
353
354
        if( av_write_header( p_sys->oc ) < 0 )
354
355
        {
355
356
            msg_Err( p_mux, "could not write header" );
 
357
            p_sys->b_write_header = VLC_FALSE;
356
358
            p_sys->b_error = VLC_TRUE;
357
359
            return VLC_EGENERIC;
358
360
        }
 
361
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
 
362
        put_flush_packet( p_sys->oc->pb );
 
363
#else
 
364
         put_flush_packet( &p_sys->oc->pb );
 
365
#endif
 
366
         p_sys->b_write_header = VLC_FALSE;
359
367
    }
360
368
 
361
369
    for( ;; )