← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/mpeg4data.h

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/mpeg4data.h
25
25
 * mpeg4 tables.
26
26
 */
27
27
 
 
28
#ifndef FFMPEG_MPEG4DATA_H
 
29
#define FFMPEG_MPEG4DATA_H
 
30
 
 
31
#include <stdint.h>
 
32
#include "mpegvideo.h"
 
33
 
28
34
// shapes
29
35
#define RECT_SHAPE       0
30
36
#define BIN_SHAPE        1
145
151
    intra_level,
146
152
};
147
153
 
148
 
static const uint16_t inter_rvlc[170][2]={ //note this is identical to the intra rvlc except that its reordered
 
154
/* Note this is identical to the intra rvlc except that it is reordered. */
 
155
static const uint16_t inter_rvlc[170][2]={
149
156
{0x0006,  3},{0x0001,  4},{0x0004,  5},{0x001C,  7},
150
157
{0x003C,  8},{0x003D,  8},{0x007C,  9},{0x00FC, 10},
151
158
{0x00FD, 10},{0x01FC, 11},{0x01FD, 11},{0x03FC, 12},
421
428
static const uint8_t mpeg4_dc_threshold[8]={
422
429
    99, 13, 15, 17, 19, 21, 23, 0
423
430
};
 
431
 
 
432
#endif /* FFMPEG_MPEG4DATA_H */