summaryrefslogtreecommitdiff
path: root/libavcodec/xsubdec.c
Commit message (Collapse)AuthorAgeFilesLines
* xsubdec: print frame size when too smallMichael Niedermayer2012-05-231-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-041-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: remove some stray comments from AVCodec declarations cosmetics: fix indentation/alignment in AVCodec declarations arm: Avoid using the movw instruction needlessly Move an int64_t down in MpegEncContext Conflicts: libavcodec/arm/ac3dsp_armv6.S Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: fix indentation/alignment in AVCodec declarationsDiego Biurrun2011-08-031-5/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-8/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+5
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-041-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not include mathematics.h in avutil.hMans Rullgard2011-07-031-0/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * 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>
* | Fix init_get_bits length argument for init_get_bits.Alexandre Colucci2011-05-021-4/+7
| | | | | | | | | | | | | | | | Do not use rlelen for buffer size in init_get_bits, it is only the size of the data for the first field. Since it is not reliable, just use the size of the whole buffer. Additional comments add removal of unused rlelen variable by Reimar Döffinger.
* | Fix decoding of DXSA subtitles.Alexandre Colucci2011-04-271-2/+3
| | | | | | | | | | These have a DXSA tag and contain alpha in addition to color values for palette.
* | add avcodec_get_subtitle_defaults() to initialize AVSubtitle structAurelien Jacobs2011-04-111-2/+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>
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-1/+1
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | 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)
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-071-1/+1
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-061-1/+2
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 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
* Fix start_display_time/end_display_time to be relative to packet pts in xsub ↵Reimar Döffinger2009-08-151-4/+7
| | | | | | | | decoder. Makes no difference for the sample AVI files since they all have no packet pts values. Originally committed as revision 19646 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent.Reimar Döffinger2009-08-151-3/+3
| | | | Originally committed as revision 19645 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove code that is now dead.Reimar Döffinger2009-08-151-4/+0
| | | | Originally committed as revision 19644 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure AVSubtitle is initialized, memset it to 0.Reimar Döffinger2009-08-151-0/+1
| | | | Originally committed as revision 19642 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set subtitle type in DVD and XSUB subtitle decoders.Janne Grunau2009-07-261-0/+1
| | | | | | 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-131-1/+1
| | | | Originally committed as revision 18494 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
* Set AVSubtitle format to 0. Neither dvdsubdec nor xsubdec intializes formatBjörn Axelsson2009-02-121-0/+2
| | | | | | | 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
* Fix timestamp parsing in XSUB decoder.Björn Axelsson2009-02-091-1/+1
| | | | | | Patch by Björn Axelsson gecko A acc D umu D se Originally committed as revision 17087 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.Michael Niedermayer2009-01-031-8/+8
| | | | 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-14/+15
| | | | | | 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
* Add long names to many AVCodec declarations.Stefano Sabatini2008-04-271-0/+1
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-211-1/+1
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constsMichael Niedermayer2008-02-011-3/+3
| | | | | | 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-2/+2
| | | | Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add proper license headerReimar Döffinger2007-08-051-0/+20
| | | | Originally committed as revision 9944 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove AVCodecContext parameter from parse_timecode functionReimar Döffinger2007-08-051-3/+3
| | | | Originally committed as revision 9943 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix deinterlacing for odd heightReimar Döffinger2007-08-051-1/+1
| | | | Originally committed as revision 9942 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Deinterlace xsub subtitlesReimar Döffinger2007-08-051-0/+4
| | | | Originally committed as revision 9941 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Colours except background should not be transparentReimar Döffinger2007-08-051-0/+3
| | | | Originally committed as revision 9940 to svn://svn.ffmpeg.org/ffmpeg/trunk
* get rid of av_rescale_q, it does not work as intended.Reimar Döffinger2007-08-051-1/+0
| | | | Originally committed as revision 9939 to svn://svn.ffmpeg.org/ffmpeg/trunk
* get rid of xsubdec array and calculate value insteadReimar Döffinger2007-08-051-3/+1
| | | | Originally committed as revision 9938 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l, runbits order was reversedReimar Döffinger2007-08-051-1/+1
| | | | Originally committed as revision 9937 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l, wrong argument to av_freepReimar Döffinger2007-08-051-1/+1
| | | | Originally committed as revision 9935 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add forgotten xsub timecode parsingReimar Döffinger2007-08-051-0/+26
| | | | Originally committed as revision 9934 to svn://svn.ffmpeg.org/ffmpeg/trunk
* First version of xsub decoder, not yet testedReimar Döffinger2007-08-051-0/+86
Originally committed as revision 9933 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status