← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_asf/ADM_asfIo.h

  • Committer: Bazaar Package Importer
  • Author(s): Matvey Kozhev
  • Date: 2007-12-18 13:53:04 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071218135304-cdqec2lg2bglyz15
Tags: 1:2.4~preview3-0.0ubuntu1
https://launchpad.net/bugs/163287
https://launchpad.net/bugs/126572
https://launchpad.net/bugs/138854
* Upload to Ubuntu. (LP: #163287, LP: #126572)
* debian/changelog: re-added Ubuntu releases.
* debian/control:
  - Require debhelper >= 5.0.51 (for dh_icons) and imagemagick.
  - Build-depend on libsdl1.2-dev instead of libsdl-dev.
  - Build against newer libx264-dev. (LP: #138854)
  - Removed libamrnb-dev, not in Ubuntu yet.
* debian/rules:
  - Install all icon sizes, using convert (upstream installs none).
  - Added missing calls to dh_installmenu, dh_installman, dh_icons and
    dh_desktop.
* debian/menu, debian/avidemux-qt.menu:
  - Corrected package and executable names.
* debian/avidemux-common.install: Install icons.
* debian/avidemux.common.manpages: Install man/avidemux.1.
* debian/links, debian/avidemux-cli.links, debian/avidemux-gtk.links:
  - Link manpages to avidemux.1.gz.
* debian/install, debian/avidemux-qt.install, debian/avidemux-gtk.desktop,
  debian/avidemux-qt.desktop: Install desktop files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_asf/ADM_asfIo.h
1
 
  uint64_t  asfPacket::read64(void)
2
 
      {
3
 
        uint64_t lo,hi;
4
 
        lo=read32();
5
 
        hi=read32();
6
 
        _offset+=8;
7
 
        ADM_assert(_offset<=pakSize);
8
 
        return lo+(hi<<32); 
9
 
        
10
 
      }
11
 
      uint32_t   asfPacket::read32(void)
12
 
      {
13
 
        uint8_t c[4];
14
 
        fread(c,4,1,_fd);
15
 
        _offset+=4;
16
 
        ADM_assert(_offset<=pakSize);
17
 
        return c[0]+(c[1]<<8)+(c[2]<<16)+(c[3]<<24);
18
 
      }
19
 
      uint32_t   asfPacket::read16(void)
20
 
      {
21
 
        uint8_t c[2];
22
 
        fread(c,2,1,_fd);
23
 
        _offset+=2;
24
 
        ADM_assert(_offset<=pakSize);
25
 
        return c[0]+(c[1]<<8);
26
 
      }
27
 
      
28
 
      uint8_t   asfPacket::read8(void)
29
 
      {
30
 
        uint8_t c[1];
31
 
        fread(c,1,1,_fd);
32
 
        _offset++;
33
 
        ADM_assert(_offset<=pakSize);
34
 
        return c[0];
35
 
      }