1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-25 14:23:15 +02:00
Commit Graph

147 Commits

Author SHA1 Message Date
4a72765a1c Do not fail DVB sub decoding because of a few padding bytes
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>
2011-02-10 21:37:31 +01:00
52b2e95cd9 dvdsubdec.c: prevent input buffer overflow
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>
2011-02-07 16:56:49 +01:00
5bea615dc3 dvbsubdec: pass correct input buffer size
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>
2011-02-07 14:21:36 +00:00
e31a744155 Remove a few if (p) av_free(p) forms
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 437fb1c87d)
2011-02-04 03:10:10 +01:00
437fb1c87d Remove a few if (p) av_free(p) forms
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-03 01:37:55 +00:00
9ef5a9deaf Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
2011-01-30 03:41:48 +01:00
dfd2a005eb Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
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 d36beb3f69)
2011-01-28 03:15:34 +01:00
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
b834becdae Pass the composition and ancillary ID for DVB subtitles via extradata instead
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
2010-07-14 17:28:40 +00:00
3174073623 Remove useless casts and memset.
Originally committed as revision 24186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 07:45:42 +00:00
2b4abbd6f5 Move colorspace.h from libavcodec to libavutil.
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 18:49:44 +00:00
08943c0bd1 dvbsub: parse display definition segment
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
2010-06-16 13:07:12 +00:00
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
29d7eef7dc Always allocate a buffer of AVPALETTE_SIZE for palette in the subtitle
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
2009-08-20 18:54:50 +00:00
8b44de14d1 Change av_log() calls surrounded by '#ifdef DEBUG' into dprintf macros.
Originally committed as revision 19550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 21:00:08 +00:00
d6a1611cc2 Set subtitle type in DVB subtitle decoder.
Patch by Janne Grunau <j?nne-f?mpeg@jannau?net>.

Originally committed as revision 19432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-14 23:12:43 +00:00
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
8bf7a510b9 Fix wrong size computation for buffer. Patch is part of
netgem's changeset.

Originally committed as revision 18477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 21:48:43 +00:00
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
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
2009-04-07 15:59:50 +00:00
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
25b4c651a3 Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.
Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 19:17:18 +00:00
db4fac64db Change AVSubtitle.rects to an array of pointers so ABI does not break
when the size of AVSubtitleRect changes.

Originally committed as revision 16412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 17:54:48 +00:00
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
dd72228e53 minor simplification
Originally committed as revision 13485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 01:34:46 +00:00
8403c543de redundant
Originally committed as revision 13484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 01:30:59 +00:00
162d4fc99d Add long names to AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 22:39:51 +00:00
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
7993df6527 consts
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 03:26:31 +00:00
cedb83a671 colour --> color in variable names
Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 13:33:48 +00:00
e59d932826 cosmetic (x==NULL -> !x)
Originally committed as revision 11067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-19 20:33:25 +00:00
5b2052b38f cosmetic (place { consistently)
Originally committed as revision 11066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-19 20:30:00 +00:00
0dd954b1f0 cosmetic (remove != 0 / != NULL)
Originally committed as revision 11064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-19 20:26:35 +00:00
e1c48b7aae use sizeof in snprintf (note the changed code is all under #if 0)
Originally committed as revision 11063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-19 20:18:30 +00:00
2867ed9b1c check region depth for validity
(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
2007-11-19 20:14:46 +00:00
5fc32c275e use get_bits1(..) instead get_bits(.., 1)
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 00:13:31 +00:00
04d2e45f3f create colorspace.h and use it where appropriate
patch by Ian Caulfield: /ian caulfield gmail com/

Originally committed as revision 9716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 12:33:14 +00:00
0d02cacda9 Move dvbsubdec parser to its own file.
Originally committed as revision 8906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 02:11:31 +00:00
0c3c674cde remove useless static cm variable
Originally committed as revision 8393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 22:53:01 +00:00
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
55fde95e3b rename cropTbl -> ff_cropTbl
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 20:08:09 +00:00
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
bf01fb696d subs.diff fixes a couple of minor bugs in my DVB subtitle decoder, and also fixes a few
problems in the DVD decoder (the palette entries were being read
back-to-front, and the timing conversions were slighly off)
patch by (Ian Caulfield: imc25, cam ac uk)

Originally committed as revision 4520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-14 01:15:27 +00:00
c6ec28b18c DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)
Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 00:28:12 +00:00