← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/packetizer/copy.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-09-17 21:56:14 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20080917215614-tj0vx8xzd57e52t8
Tags: 0.9.2-1ubuntu1
https://launchpad.net/bugs/270404
https://launchpad.net/bugs/210354
https://launchpad.net/bugs/199870
https://launchpad.net/bugs/261567
* New Upstream Release, exception granted by
    - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404

Changes done in ubuntu:

* add libxul-dev to build-depends
* make sure that vlc is build against libxul in configure. This doesn't
  change anything in the package, but makes it more robust if building
  in an 'unclean' chroot or when modifying the package.
* debian/control: make Vcs-* fields point to the motumedia branch
* add libx264-dev and libass-dev to build-depends
  LP: #210354, #199870
* actually enable libass support by passing --enable-libass to configure
* enable libdca: add libdca-dev to build depends and --enable-libdca
* install the x264 plugin.

Changes already in the pkg-multimedia branch in debian:

* don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install  
* new upstream .desktop file now registers flash video mimetype LP: #261567
* add Xb-Npp-Applications to mozilla-plugin-vlc
* remove duplicate entries in debian/vlc-nox.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/packetizer/copy.c
2
2
 * copy.c
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2001, 2002, 2006 the VideoLAN team
5
 
 * $Id: d4128fe43398d297c8f5c89b874f21b00e77ba87 $
 
5
 * $Id$
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Eric Petit <titer@videolan.org>
25
25
/*****************************************************************************
26
26
 * Preamble
27
27
 *****************************************************************************/
28
 
#include <stdlib.h>                                      /* malloc(), free() */
29
 
 
30
 
#include <vlc/vlc.h>
31
 
#include <vlc/decoder.h>
32
 
#include <vlc/input.h>
 
28
 
 
29
#ifdef HAVE_CONFIG_H
 
30
# include "config.h"
 
31
#endif
 
32
 
 
33
#include <vlc_common.h>
 
34
#include <vlc_plugin.h>
 
35
#include <vlc_codec.h>
 
36
#include <vlc_block.h>
33
37
 
34
38
/*****************************************************************************
35
39
 * Module descriptor
40
44
vlc_module_begin();
41
45
    set_category( CAT_SOUT );
42
46
    set_subcategory( SUBCAT_SOUT_PACKETIZER );
43
 
    set_description( _("Copy packetizer") );
 
47
    set_description( N_("Copy packetizer") );
44
48
    set_capability( "packetizer", 1 );
45
49
    set_callbacks( Open, Close );
46
50
vlc_module_end();
243
247
        block_ChainRelease( p_dec->p_sys->p_block );
244
248
    }
245
249
 
 
250
    es_format_Clean( &p_dec->fmt_out );
246
251
    free( p_dec->p_sys );
247
252
}
248
253
 
255
260
    block_t *p_ret = p_dec->p_sys->p_block;
256
261
 
257
262
    if( pp_block == NULL || *pp_block == NULL )
 
263
        return NULL;
 
264
    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
258
265
    {
 
266
        block_Release( *pp_block );
259
267
        return NULL;
260
268
    }
 
269
 
261
270
    p_block = *pp_block;
262
271
    *pp_block = NULL;
263
272
 
290
299
    block_t *p_block;
291
300
 
292
301
    if( pp_block == NULL || *pp_block == NULL )
 
302
        return NULL;
 
303
    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
293
304
    {
 
305
        block_Release( *pp_block );
294
306
        return NULL;
295
307
    }
 
308
 
296
309
    p_block = *pp_block;
297
310
    *pp_block = NULL;
298
311