Commit Graph

41 Commits

Author SHA1 Message Date
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master'
* 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>
2011-07-04 00:45:21 +02:00
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01:00
Alexandre Colucci
3b4621acbb Fix init_get_bits length argument for init_get_bits.
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.
2011-05-02 18:57:51 +02:00
Alexandre Colucci
d6f910ea47 Fix decoding of DXSA subtitles.
These have a DXSA tag and contain alpha in addition to
color values for palette.
2011-04-27 19:45:57 +02:00
Aurelien Jacobs
3ee8ca9b08 add avcodec_get_subtitle_defaults() to initialize AVSubtitle struct
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>
2011-04-11 23:27:50 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
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>
2011-02-15 16:18:21 +01:00
Diego Elio Pettenò
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
Diego Elio Pettenò
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
Stefano Sabatini
e16f217ceb Use new imgutils.h API names, fix deprecation warnings.
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 19:15:29 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 09:37:04 +00:00
Stefano Sabatini
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
Reimar Döffinger
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
Reimar Döffinger
cea0b5272d Fix start_display_time/end_display_time to be relative to packet pts in xsub 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
2009-08-15 09:12:58 +00:00
Reimar Döffinger
4a3190ed40 Reindent.
Originally committed as revision 19645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:58:26 +00:00
Reimar Döffinger
fd35d6d097 Remove code that is now dead.
Originally committed as revision 19644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:57:24 +00:00
Reimar Döffinger
df47d24501 Make sure AVSubtitle is initialized, memset it to 0.
Originally committed as revision 19642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 00:46:33 +00:00
Janne Grunau
6dc13ccbcc Set subtitle type in DVD and XSUB subtitle decoders.
Patch by Janne Grunau <ja?ne-f?mpeg jannau net>.

Originally committed as revision 19512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 23:08:04 +00:00
Stefano Sabatini
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
Thilo Borgmann
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
Björn Axelsson
37a43cfb39 Set AVSubtitle format to 0. Neither dvdsubdec nor xsubdec intializes format
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
2009-02-12 01:27:56 +00:00
Björn Axelsson
ffe2c09d46 Fix timestamp parsing in XSUB decoder.
Patch by Björn Axelsson gecko A acc D umu D se

Originally committed as revision 17087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 00:18:26 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Stefano Sabatini
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
Stefano Sabatini
d5202e4fda Add long names to many AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +00:00
Zuxy Meng
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
Michael Niedermayer
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
Diego Biurrun
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
Reimar Döffinger
6628165891 Add proper license header
Originally committed as revision 9944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:34 +00:00
Reimar Döffinger
369f73062b Remove AVCodecContext parameter from parse_timecode function
Originally committed as revision 9943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:31 +00:00
Reimar Döffinger
e3c90129a4 Fix deinterlacing for odd height
Originally committed as revision 9942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:28 +00:00
Reimar Döffinger
3c247b4ff7 Deinterlace xsub subtitles
Originally committed as revision 9941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:26 +00:00
Reimar Döffinger
3143c78716 Colours except background should not be transparent
Originally committed as revision 9940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:24 +00:00
Reimar Döffinger
d5049e2c69 get rid of av_rescale_q, it does not work as intended.
Originally committed as revision 9939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:22 +00:00
Reimar Döffinger
d6136c7618 get rid of xsubdec array and calculate value instead
Originally committed as revision 9938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:20 +00:00
Reimar Döffinger
737c5ebfc8 10l, runbits order was reversed
Originally committed as revision 9937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:18 +00:00
Reimar Döffinger
5968b39635 100l, wrong argument to av_freep
Originally committed as revision 9935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:13 +00:00
Reimar Döffinger
59f6f64e30 Add forgotten xsub timecode parsing
Originally committed as revision 9934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:11 +00:00
Reimar Döffinger
7e2643ae8d First version of xsub decoder, not yet tested
Originally committed as revision 9933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 12:11:09 +00:00