diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-03-27 16:46:33 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-03-27 16:46:33 +0000 |
| commit | 97f5c8885abdaff05235b201f284398fd5c2dac2 (patch) | |
| tree | 1c1cb4800d0ea51687c444f5967440d6d4f37179 /src/lib/ffmpeg | |
| parent | 0f1c2f282869a7a2afaca53dd23fb440a8d25cec (diff) | |
| download | usdx-97f5c8885abdaff05235b201f284398fd5c2dac2.tar.gz usdx-97f5c8885abdaff05235b201f284398fd5c2dac2.tar.xz usdx-97f5c8885abdaff05235b201f284398fd5c2dac2.zip | |
move AVPaletteControl
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2845 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg7/avcodec.pas | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/ffmpeg7/avcodec.pas b/src/lib/ffmpeg7/avcodec.pas index ad3eb10a..1a67afb5 100644 --- a/src/lib/ffmpeg7/avcodec.pas +++ b/src/lib/ffmpeg7/avcodec.pas @@ -1540,6 +1540,29 @@ type // int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr) TExecute2Func = function(c2: PAVCodecContext; arg: Pointer; jobnr: cint; threadnr: cint): cint; cdecl; +{$IF FF_API_PALETTE_CONTROL} +(** + * AVPaletteControl + * This structure defines a method for communicating palette changes + * between and demuxer and a decoder. + * + * @deprecated Use AVPacket to send palette changes instead. + * This is totally broken. + *) + PAVPaletteControl = ^TAVPaletteControl; + TAVPaletteControl = record + (* demuxer sets this to 1 to indicate the palette has changed; + * decoder resets to 0 *) + palette_changed: cint; + + (* 4-byte ARGB palette entries, stored in native byte order; note that + * the individual palette components should be on a 8-bit scale; if + * the palette data comes from a IBM VGA native format, the component + * data is probably 6 bits in size and needs to be scaled *) + palette: array [0..AVPALETTE_COUNT - 1] of cuint; + end; {deprecated;} +{$IFEND} + (** * main external API structure. * New fields can be added to the end with minor version bumps. @@ -3324,29 +3347,6 @@ type linesize: array [0..3] of cint; ///< number of bytes per line end; {TAVPicture} -{$IF FF_API_PALETTE_CONTROL} -(** - * AVPaletteControl - * This structure defines a method for communicating palette changes - * between and demuxer and a decoder. - * - * @deprecated Use AVPacket to send palette changes instead. - * This is totally broken. - *) - PAVPaletteControl = ^TAVPaletteControl; - TAVPaletteControl = record - (* demuxer sets this to 1 to indicate the palette has changed; - * decoder resets to 0 *) - palette_changed: cint; - - (* 4-byte ARGB palette entries, stored in native byte order; note that - * the individual palette components should be on a 8-bit scale; if - * the palette data comes from a IBM VGA native format, the component - * data is probably 6 bits in size and needs to be scaled *) - palette: array [0..AVPALETTE_COUNT - 1] of cuint; - end; {deprecated;} -{$IFEND} - TAVSubtitleType = ( SUBTITLE_NONE, |