summaryrefslogtreecommitdiff
path: root/libavcodec/dvdsubdec.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove some stray unnecessary ffmpeg references.Diego Biurrun2011-11-02
| |
* | dvdsubdec: fix bad free in dvdsub_initKelly Anderson2011-09-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdsubdec: Move colormap and alpha to contextJoakim Plate2011-09-13
| | | | | | | | | | This makes it rememember old values should the stream not contain new values for these for each subtitle.
* | dvdsubdec: Support palette information for vobsub's stored as text in extradataJoakim Plate2011-09-12
| | | | | | | | | | | | This is how mkv's store palette information for vobsubs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Abort if command offset decreases, avoids potential endless loop.Reimar Döffinger2011-08-03
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-29
| | | | | | | | It's more readable and less prone to breakage.
| * dvdsubdec: fix incorrect colors.Alexandre Colucci2011-05-24
| | | | | | | | | | | | | | | | | | | | | | | | On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2 When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-26
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Change guess_palette so its output matches the most common palette.Reimar Döffinger2011-05-02
| | | | | | | | | | | | | | | | This means it uses full brightness range and brightness increasing instead of decreasing with index of non-opaque color. Based on patch by Alexandre Colucci [alexandre elgato com]
* | add avcodec_get_subtitle_defaults() to initialize AVSubtitle structAurelien Jacobs2011-04-11
| | | | | | | | | | | | | | | | Call this new function before decode() to replace the custom and inconsistant initialization in various decoders. This function is equivalent to avcodec_get_frame_defaults() for AVFrame. Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
* | Fix incorrect colors when decoding DVD subtitlesAlexandre Colucci2011-03-25
| | | | | | | | | | | | | | | | | | | | On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2 When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set.
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-28
|/ | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
* remove useless castAurelien Jacobs2010-07-27
| | | | Originally committed as revision 24553 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move colorspace.h from libavcodec to libavutil.Stefano Sabatini2010-07-01
| | | | | | Avoid a compile-time dependency of the pad filter on libavcodec. Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Always allocate a buffer of AVPALETTE_SIZE for palette in the subtitleReimar Döffinger2009-08-20
| | | | | | | decoders instead of as small as possible. This avoids completely unnecessary issues with e.g. libswscale. Originally committed as revision 19673 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify initialization of AVSubtitle by using memset.Reimar Döffinger2009-08-15
| | | | Originally committed as revision 19643 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix cmd_pos bounds check to avoid the overflow case.Reimar Döffinger2009-08-15
| | | | Originally committed as revision 19640 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change av_log() calls surrounded by '#ifdef DEBUG' into dprintf macros.Diego Biurrun2009-07-30
| | | | Originally committed as revision 19550 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set subtitle type in DVD and XSUB subtitle decoders.Janne Grunau2009-07-26
| | | | | | Patch by Janne Grunau <ja?ne-f?mpeg jannau net>. Originally committed as revision 19512 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-13
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-07
| | | | | | | | | | | AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set AVSubtitle format to 0. Neither dvdsubdec nor xsubdec intializes formatBjörn Axelsson2009-02-12
| | | | | | | to 0, but ffplay checks it before displaying subtitles (ffplay.c:1437). patch by Björn Axelsson, gecko acc.umu se Originally committed as revision 17170 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.Michael Niedermayer2009-01-03
| | | | Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Forgot to update (I likely missed it due to its similar name to dvb...)Michael Niedermayer2009-01-03
| | | | Originally committed as revision 16414 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dvdsubdec: allow compilation with -DDEBUGMåns Rullgård2008-07-13
| | | | Originally committed as revision 14212 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini2008-06-12
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long names to AVCodec declarations.Stefano Sabatini2008-04-27
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constsMichael Niedermayer2008-02-01
| | | | | | I have underestimated this a little, and these are just some ... Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove some empty close/init functions in avcodecAurelien Jacobs2007-11-25
| | | | | | patch by Alex Originally committed as revision 11093 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent two lines.Ian Caulfield2007-07-24
| | | | | | Patch by: Ian Caulfield, ian caulfield & gmx at Originally committed as revision 9789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add HD-DVD subpicture decoding.Ian Caulfield2007-07-24
| | | | | | Patch by: Ian Caulfield, ian caulfield & gmx at Originally committed as revision 9788 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename "palette" to "colormap" when it's referring to the mapping from a 2-bitIan Caulfield2007-07-24
| | | | | | | encoded color to a 4-bit index into the DVD palette. Patch by: Ian Caulfield, ian caulfield & gmx at Originally committed as revision 9787 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move dvdsub parser to its own file.Diego Biurrun2007-05-06
| | | | Originally committed as revision 8910 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove the getbe16 functions and use the AV_RB16 macro instead. Patch by IanPanagiotis Issaris2007-01-30
| | | | | | Caulfield, ian dot caulfield gmail dot com. Originally committed as revision 7768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a bug in the DVD subtitle decoder where subtitles with odd heights would notIan Caulfield2007-01-30
| | | | | | | have the last line decoded, leaving the bottom line of the bitmap array uninitialised. Patch by Ian Caulfield, ian dot caulfield gmail dot com. Originally committed as revision 7767 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename dvdsub.c to dvdsubdec.c.Diego Biurrun2006-10-27
Originally committed as revision 6815 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 15:02:21 +0000