1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

27 Commits

Author SHA1 Message Date
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master'
* 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>
2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs.
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +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
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
David Conrad
e9d96831f7 schroenc: Set colorspace info
Originally committed as revision 23030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:38:02 +00:00
David Conrad
37284120ca schroenc: Use AV_RB32
Originally committed as revision 23029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:37:58 +00:00
David Conrad
31cf8c650a schroenc: Set open-gop
Originally committed as revision 23028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:49 +00:00
David Conrad
3d6fa004e8 schroenc: Set keyframe interval
Originally committed as revision 23027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:45 +00:00
David Conrad
e0a24555b4 schroenc: Use constant quality for constant quality, not noise threshold
Originally committed as revision 23026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:41 +00:00
David Conrad
614748ceeb schroenc: Don't touch gop_structure by default, it should be left adaptive
Originally committed as revision 23025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:37 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +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
2ba8301769 Mark all pix_fmts and supported_framerates compound literals as const.
Makes no difference for gcc but at least icc can put them in .rodata then.

Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 16:09:21 +00:00
Anuradha Suraparaju
d15f2e00c5 Fix bug caused by difference in stride and picture width.
When a frame is allocated using libschroedinger routines, the frame data size
does not match the actual frame size if the width is not a multiple of 16. So
we cannot do a straightforward memcpy of the frame returned by libschroedinger
into the FFmpeg picture as the stride differs from the width.

Fix this bug by allocating for the libschroedinger frame with the dimensions
in AVCodecContext within libavcodec and passing the frame to libschroedinger.

patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 19653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:59:53 +00:00
Diego Biurrun
0ebe3b8e2b cosmetics: indentation, prettyprinting, K&R coding style
Originally committed as revision 19652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:42:15 +00:00
Diego Biurrun
e6cb49bfa9 Simplify another 'if' condition: Replace 'exp == 0' by '!exp'.
Originally committed as revision 19650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:31:42 +00:00
Diego Biurrun
735a38045a Remove useless braces around if/for/while expressions.
Originally committed as revision 19648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:12:47 +00:00
Diego Biurrun
7c809dc3e2 Simplify 'if' condition statements.
Drop useless '!= 0' from 'exp != 0', replace 'exp == 0' by '!exp'.

Originally committed as revision 19647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:02:50 +00:00
Anuradha Suraparaju
9fc88d7e20 Fix crash when encoding using libschroedinger.
Currently only pixel and half-pixel motion vector precisions are supported in
libschroedinger. Setting the mv_precision field to 2 (i.e. quarter pixel)
causes a crash in the libschroedinger encoder calls. By not setting this
parameter, we fall back to the default value used in libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 17132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 14:27:16 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Anuradha Suraparaju
d7c96d6623 Add support for creating Simple Profile (I-frame only, no arithmetic coding)
Dirac bytestreams.  patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 15286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 14:47:47 +00:00
Anuradha Suraparaju
007f67b012 Fix pts handling when encoding with libschroedinger, closes issue 453.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 14192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 20:12:18 +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
Diego Biurrun
9f4aa35359 missing codec long names by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-17 10:20:01 +00:00
Carl Eugen Hoyos
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 22:28:43 +00:00
Anuradha Suraparaju
f7cd9eed5d Add Dirac support through libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 13046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 13:59:45 +00:00