← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/demux/live555.cpp

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-03-23 19:03:52 UTC
  • mfrom: (1.3.24)
  • Revision ID: package-import@ubuntu.com-20120323190352-umxyxxd5fdxseim8
Tags: 2.0.1-1
https://launchpad.net/bugs/931318
https://launchpad.net/bugs/943014
https://launchpad.net/bugs/947814
http://bugs.debian.org/662539
* New upstream release (LP: #931318, #943014, #947814).
* Change build dependency from libpng12-dev to libpng-dev. (Closes: #662539)
* Add --enable-dbus to configure flags.
* Drop patches that were backported and accepted by upstream.
* Add missing libxinerama-dev build dependency for the Skins2 interface.
* Add libgtk2.0-dev back to build dependencies for the notify plugin.
* Set urgency to high for security fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/demux/live555.cpp
2
2
 * live555.cpp : LIVE555 Streaming Media support.
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003-2007 the VideoLAN team
5
 
 * $Id: ed67d8b9b95a8cdf7770068705a72b3d40132d0f $
 
5
 * $Id: 0c24344a1a92ad63d7fc34c94b96f37b56727774 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Derk-Jan Hartman <hartman at videolan. org>
1737
1737
        QuickTimeGenericRTPSource::QTState &qtState = qtRTPSource->qtState;
1738
1738
        uint8_t *sdAtom = (uint8_t*)&qtState.sdAtom[4];
1739
1739
 
 
1740
        /* Get codec informations from the quicktime atoms :
 
1741
         * http://developer.apple.com/quicktime/icefloe/dispatch026.html */
1740
1742
        if( tk->fmt.i_cat == VIDEO_ES ) {
1741
1743
            if( qtState.sdAtomSize < 16 + 32 )
1742
1744
            {
1777
1779
            }
1778
1780
        }
1779
1781
        else {
1780
 
            if( qtState.sdAtomSize < 4 )
 
1782
            if( qtState.sdAtomSize < 24 )
1781
1783
            {
1782
1784
                /* invalid */
1783
1785
                p_sys->event_data = 0xff;
1785
1787
                return;
1786
1788
            }
1787
1789
            tk->fmt.i_codec = VLC_FOURCC(sdAtom[0],sdAtom[1],sdAtom[2],sdAtom[3]);
 
1790
            tk->fmt.audio.i_bitspersample = (sdAtom[22] << 8) | sdAtom[23];
1788
1791
        }
1789
1792
        tk->p_es = es_out_Add( p_demux->out, &tk->fmt );
1790
1793
    }