summaryrefslogtreecommitdiff
path: root/libavcodec/dvbsubdec.c
Commit message (Collapse)AuthorAgeFilesLines
* dvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16Joakim Plate2011-09-101-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-8/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-291-8/+7
| | | | | | | | It's more readable and less prone to breakage.
* | Patch for memory leaks in DVB subtitles decoderJernej Fijačko2011-07-161-0/+1
| | | | | | | | Signed-off-by: Joakim Plate <elupus@ecce.se>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dvbsubdec: Fix compilation of debug code.Diego Biurrun2011-06-081-4/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-081-32/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. ... Conflicts: doc/APIchanges libavcodec/ac3enc.c libavutil/avutil.h libavutil/samplefmt.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace some av_log/printf + #ifdef combinations by av_dlog.Diego Biurrun2011-06-071-28/+13
| |
| * Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG.Diego Biurrun2011-06-071-4/+3
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dvbsubdec: check against buffer overreadsJanne Grunau2011-02-101-2/+9
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * Do not fail DVB sub decoding because of a few padding bytesReimar Döffinger2011-02-101-7/+2
| | | | | | | | | | | | | | | | | | Instead of returning an error when bytes are left over, just return the number of actually used bytes as other decoders do. Instead add a special case so an error will be returned when none of the data looks valid to avoid making debugging a pain. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * dvbsubdec: pass correct input buffer sizeJindrich Makovicka2011-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | In some places, dvbsubdec passes improper input buffer size to bitstream reading functions, not accounting for reading pointer updates. Fixed by using buffer_end - buffer pointer instead of fixed buffer length. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove a few if (p) av_free(p) formsClément Bœsch2011-02-031-5/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace dprintf with av_dlogLuca Barbato2011-01-291-8/+8
| | | | | | | | dprintf clashes with POSIX.1-2008
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | dvbsubdec: Split delete_state()JULIAN GARDNER2011-05-041-18/+38
| |
* | add avcodec_get_subtitle_defaults() to initialize AVSubtitle structAurelien Jacobs2011-04-111-3/+0
| | | | | | | | | | | | | | | | 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>
* | dvbsubdec: check against buffer overreadsJanne Grunau2011-02-111-2/+9
| | | | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 493aa30adf88baf5bc734072592a22db586f0cfb)
* | Do not fail DVB sub decoding because of a few padding bytesReimar Döffinger2011-02-111-7/+2
| | | | | | | | | | | | | | | | | | | | Instead of returning an error when bytes are left over, just return the number of actually used bytes as other decoders do. Instead add a special case so an error will be returned when none of the data looks valid to avoid making debugging a pain. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 4a72765a1c94b05bd3053b1f34f8457a3b71d714)
* | dvdsubdec.c: prevent input buffer overflowJindrich Makovicka2011-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | In some places, dvbsubdec passes improper input buffer size to bitstream reading functions, not accounting for reading pointer updates. Fixed by using buffer_end - buffer pointer instead of fixed buffer length. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove a few if (p) av_free(p) formsClément Bœsch2011-02-041-5/+2
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 437fb1c87d7b4b0730db97d0858b4f39fffff2a9)
* | Replace dprintf with av_dlogLuca Barbato2011-01-301-8/+8
| | | | | | | | | | 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-281-1/+1
|/ | | | | | | | 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)
* Pass the composition and ancillary ID for DVB subtitles via extradata insteadReimar Döffinger2010-07-141-3/+10
| | | | | | | | | | of sub_id, this allows detecting when that information is not available and just decode everything. In addition extradata is required for many codecs and thus in contrast to sub_id generally already passed on by any programs using libav*. Also ask for a sample if we encounter a stream with multiple/changing IDs. Originally committed as revision 24238 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless casts and memset.Reimar Döffinger2010-07-111-12/+10
| | | | Originally committed as revision 24186 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move colorspace.h from libavcodec to libavutil.Stefano Sabatini2010-07-011-1/+1
| | | | | | Avoid a compile-time dependency of the pad filter on libavcodec. Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dvbsub: parse display definition segmentJanne Grunau2010-06-161-2/+65
| | | | | | | The display definition segment is used to properly display SD DVB subtitles in HD video streams. Originally committed as revision 23626 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | 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-201-1/+1
| | | | | | | 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
* Change av_log() calls surrounded by '#ifdef DEBUG' into dprintf macros.Diego Biurrun2009-07-301-25/+9
| | | | Originally committed as revision 19550 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set subtitle type in DVB subtitle decoder.Janne Grunau2009-07-141-0/+1
| | | | | | Patch by Janne Grunau <j?nne-f?mpeg@jannau?net>. Originally committed as revision 19432 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix wrong size computation for buffer. Patch is part ofReynaldo H. Verdejo Pinochet2009-04-121-4/+4
| | | | | | netgem's changeset. Originally committed as revision 18477 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-071-1/+3
| | | | | | | | | | | 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
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.Michael Niedermayer2009-01-031-5/+5
| | | | Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change AVSubtitle.rects to an array of pointers so ABI does not breakMichael Niedermayer2009-01-031-3/+6
| | | | | | when the size of AVSubtitleRect changes. Originally committed as revision 16412 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini2008-06-121-1/+1
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* minor simplificationMichael Niedermayer2008-05-281-4/+4
| | | | Originally committed as revision 13485 to svn://svn.ffmpeg.org/ffmpeg/trunk
* redundantMichael Niedermayer2008-05-281-1/+2
| | | | Originally committed as revision 13484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long names to AVCodec declarations.Stefano Sabatini2008-04-271-0/+1
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-211-2/+2
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constsMichael Niedermayer2008-02-011-18/+18
| | | | | | I have underestimated this a little, and these are just some ... Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
* colour --> color in variable namesDiego Biurrun2007-12-031-14/+14
| | | | Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic (x==NULL -> !x)Michael Niedermayer2007-11-191-7/+7
| | | | Originally committed as revision 11067 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic (place { consistently)Michael Niedermayer2007-11-191-22/+11
| | | | Originally committed as revision 11066 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic (remove != 0 / != NULL)Michael Niedermayer2007-11-191-44/+44
| | | | Originally committed as revision 11064 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use sizeof in snprintf (note the changed code is all under #if 0)Michael Niedermayer2007-11-191-5/+5
| | | | Originally committed as revision 11063 to svn://svn.ffmpeg.org/ffmpeg/trunk
* check region depth for validityMichael Niedermayer2007-11-191-0/+4
| | | | | | | (32/64/128 would crash at least due to 1<<depth allocation later, and no i do not have a sample file) Originally committed as revision 11062 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status