← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_audio/aviaudio.hxx

  • 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_audio/aviaudio.hxx
22
22
class AviList;
23
23
 
24
24
 
25
 
#include "ADM_audio/ADM_audiodef.h"
 
25
#include "../ADM_audio/ADM_audiodef.h"
26
26
typedef struct
27
27
{
28
28
        uint16_t        encoding;       
60
60
#define WAV_8BITS       53 // dummy id
61
61
#define WAV_MP4         54 // dummy id
62
62
#define WAV_AAC         0xff // dummy id
 
63
#define WAV_AAC_HE      0xfe // dummy id
63
64
#define WAV_8BITS_UNSIGNED      55 // dummy id
64
65
#define WAV_AMRNB       56 // dummy id
65
66
#define WAV_ULAW        57 // dummy id
66
67
#define WAV_QDM2        58
67
68
#define WAV_IMAADPCM    17
 
69
#define WAV_AMV_ADPCM    9900
 
70
#define WAV_NELLYMOSER   9901
68
71
#define WAV_UNKNOWN     9999
69
 
#include "ADM_audiocodec/ADM_audiocodec.h"
70
 
#include "ADM_library/ADM_fileio.h"
 
72
#include "../ADM_audiocodec/ADM_audiocodec.h"
 
73
#include "ADM_fileio.h"
71
74
 
72
75
 
73
76
 
164
167
;
165
168
 
166
169
 
167
 
#include "ADM_library/indexer.hxx"
 
170
#include "indexer.hxx"
168
171
uint8_t mpegAudioIdentify(uint8_t *ptr, uint32_t maxLookUp, WAVHeader *header, uint8_t *tokens=NULL);
169
172
 
170
173
#endif