← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_mpegdemuxer/dmx_identify.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-12-15 17:13:20 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061215171320-w79pvpehxx2fr217
Tags: 1:2.3.0-0.0ubuntu1
* Merge from debian-multimedia.org, remaining Ubuntu change:
  - desktop file,
  - no support for ccache and make -j.
* Closes Ubuntu: #69614.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_mpegdemuxer/dmx_identify.cpp
40
40
{
41
41
DMX_TYPE ret=DMX_MPG_UNKNOWN;
42
42
uint64_t pos;
 
43
uint32_t head1,head2;
43
44
uint8_t stream;
44
45
FP_TYPE fp=FP_DONT_APPEND;
45
46
        uint64_t size;
52
53
        {
53
54
                goto _fnd;
54
55
        }
 
56
        // Maybe ASF, MS-DVR file ?
 
57
        head1=parser->read32i();
 
58
        head2=parser->read32i();
 
59
        parser->setpos(0);
 
60
        if(head1==0x3026B275 && head2 ==0x8e66CF11)
 
61
        {
 
62
          delete parser;
 
63
          return DMX_MPG_MSDVR;
 
64
        }
55
65
        // Try to see if it is a TS:
56
66
        if(probeTs(parser))
57
67
                {