diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-17 00:28:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-17 00:28:12 +0000 |
| commit | c6ec28b18cd1eb7d39e6163137367f2d1c62aa7c (patch) | |
| tree | a0055aeb706ad0230cf7bc7cc8b48d582057f9d8 /libavcodec/avcodec.h | |
| parent | 6e5c1877b2a93dd63610a1504e95bddc891424f3 (diff) | |
DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)
Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 178e65f0f6..43029a58b2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1930,18 +1930,23 @@ typedef struct AVPaletteControl { } AVPaletteControl; -typedef struct AVSubtitle { - uint16_t format; /* 0 = graphics */ +typedef struct AVSubtitleRect { uint16_t x; uint16_t y; uint16_t w; uint16_t h; uint16_t nb_colors; - uint32_t start_display_time; /* relative to packet pts, in ms */ - uint32_t end_display_time; /* relative to packet pts, in ms */ int linesize; uint32_t *rgba_palette; uint8_t *bitmap; +} AVSubtitleRect; + +typedef struct AVSubtitle { + uint16_t format; /* 0 = graphics */ + uint32_t start_display_time; /* relative to packet pts, in ms */ + uint32_t end_display_time; /* relative to packet pts, in ms */ + uint32_t num_rects; + AVSubtitleRect *rects; } AVSubtitle; extern AVCodec ac3_encoder; @@ -2135,6 +2140,7 @@ extern AVCodec dts_decoder; /* subtitles */ extern AVCodec dvdsub_decoder; extern AVCodec dvbsub_encoder; +extern AVCodec dvbsub_decoder; /* resample.c */ @@ -2390,6 +2396,7 @@ extern AVCodecParser pnm_parser; extern AVCodecParser mpegaudio_parser; extern AVCodecParser ac3_parser; extern AVCodecParser dvdsub_parser; +extern AVCodecParser dvbsub_parser; /* memory */ void *av_malloc(unsigned int size); |