Commit Graph

66 Commits

Author SHA1 Message Date
Michael Niedermayer
6df1cfa7e4 mace: check channel count, fixes FPE
Fixes ticket1391

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-03 15:01:34 +02:00
Michael Niedermayer
6101e5322f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
  asfdec: Add an option for not searching for the packet markers
  cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
  cosmetics: Align codec declarations
  cosmetics: Convert mimic.c to utf-8
  avconv: remove an unused function parameter.
  avconv: remove now pointless variables.
  avconv: drop support for building without libavfilter.
  nellymoserenc: fix crash due to memsetting the wrong area.
  libavformat: Only require first packet to be known for audio/video streams
  avplay: Don't try to scale timestamps if the tb isn't set

Conflicts:
	Changelog
	configure
	ffmpeg.c
	libavcodec/aacenc.c
	libavcodec/bmpenc.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/ffv1.c
	libavcodec/flacenc.c
	libavcodec/fraps.c
	libavcodec/huffyuv.c
	libavcodec/libopenjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/pamenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngenc.c
	libavcodec/qtrleenc.c
	libavcodec/rawdec.c
	libavcodec/sgienc.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.c
	libavcodec/wmv2dec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-07 22:41:37 +02:00
Martin Storsjö
00c3b67b8a cosmetics: Align codec declarations
Also break some long lines, remove codec function placeholder comments
and add spaces in sample/pixel format lists.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-04-06 22:37:38 +03:00
Michael Niedermayer
c065255bba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
Alex Converse
7181c4edee cosmetics: Remove extra newlines at EOF 2012-01-27 17:19:09 -08:00
Michael Niedermayer
e4de71677f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aac_latm: reconfigure decoder on audio specific config changes
  latmdec: fix audio specific config parsing
  Add avcodec_decode_audio4().
  avcodec: change number of plane pointers from 4 to 8 at next major bump.
  Update developers documentation with coding conventions.
  svq1dec: avoid undefined get_bits(0) call
  ARM: h264dsp_neon cosmetics
  ARM: make some NEON macros reusable
  Do not memcpy raw video frames when using null muxer
  fate: update asf seektest
  vp8: flush buffers on size changes.
  doc: improve general documentation for MacOSX
  asf: use packet dts as approximation of pts
  asf: do not call av_read_frame
  rtsp: Initialize the media_type_mask in the rtp guessing demuxer
  Cleaned up alacenc.c

Conflicts:
	doc/APIchanges
	doc/developer.texi
	libavcodec/8svx.c
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/nellymoserdec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/asfdec.c
	tests/ref/seek/lavf_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03 03:00:30 +01:00
Justin Ruggles
0eea212943 Add avcodec_decode_audio4().
Deprecate avcodec_decode_audio3().
Implement audio support in avcodec_default_get_buffer().
Implement the new audio decoder API in all audio decoders.
2011-12-02 17:40:40 -05:00
Michael Niedermayer
4354788a89 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  tls: Use ERR_get_error() in do_tls_poll
  indeo3: Fix a fencepost error.
  mxfdec: Fix comparison of unsigned expression < 0.
  mpegts: set stream id on just created stream, not an unrelated variable
  ra288: return error if input buffer is too small
  ra288: utilize DSPContext.vector_fmul()
  ra288: use memcpy() to copy decoded samples to output
  mace: only calculate output buffer size once
  Remove redundant filename self-references inside files.
  indeo3data: add missing config.h #include for HAVE_BIGENDIAN
  x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
  avplay: reset rdft when closing stream.
  doc/git-howto: expand format-patch and send-email notes.
  lavf: expand doxy for some AVFormatContext fields.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 02:59:49 +01:00
Justin Ruggles
f50b6be57d mace: only calculate output buffer size once 2011-11-08 12:36:14 -05:00
Michael Niedermayer
988f585fcb Merge remote-tracking branch 'qatar/master'
* qatar/master: (44 commits)
  replacement Indeo 3 decoder
  gsm demuxer: do not allocate packet twice.
  flvenc: use first packet delay as global delay.
  ac3enc: doxygen update.
  imc: return error codes instead of 0 for error conditions.
  imc: return meaningful error codes instead of -1
  imc: do not set channel layout for stereo
  imc: validate channel count
  imc: check for ff_fft_init() failure
  imc: check output buffer size before decoding
  imc: use DSPContext.bswap16_buf() to byte-swap packet data
  rtsp: add allowed_media_types option
  libgsm: add flush function to reset the decoder state when seeking
  libgsm: simplify decoding by using a loop
  gsm: log error message when packet is too small
  libgsmdec: do not needlessly set *data_size to 0
  gsmdec: do not needlessly set *data_size to 0
  gsmdec: add flush function to reset the decoder state when seeking
  libgsmdec: check output buffer size before decoding
  gsmdec: log error message when output buffer is too small.
  ...

Conflicts:
	Changelog
	ffplay.c
	libavcodec/indeo3.c
	libavcodec/mjpeg_parser.c
	libavcodec/vp3.c
	libavformat/cutils.c
	libavformat/id3v2.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 02:16:26 +01:00
Diego Biurrun
2f5df0b12c Replace ffmpeg references with more accurate libav* references. 2011-11-02 10:42:55 +01:00
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
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +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
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
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
Vitor Sessak
da708eaa22 Cosmetics: rename mace3_decode_frame() to mace_decode_frame()
Originally committed as revision 15569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 20:12:20 +00:00
Vitor Sessak
10c1d19212 Avoid code duplication between mace3_decode_frame() and mace6_decode_frame()
Originally committed as revision 15568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 20:06:40 +00:00
Vitor Sessak
b0e047de15 Use a for() instead of triplicating code.
Originally committed as revision 15566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 16:33:43 +00:00
Vitor Sessak
3a54087733 Factorize duplicate table reading code.
Originally committed as revision 15564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 14:36:10 +00:00
Vitor Sessak
955bcc2102 Convert two tables to signed decimal
Originally committed as revision 15290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 19:20:20 +00:00
Vitor Sessak
90c6805ac4 Cosmetics: remove useless parentheses
Originally committed as revision 15288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 16:51:39 +00:00
Vitor Sessak
710428c4ec Remove ChannelData.lev var and use ChannelData.level instead
Originally committed as revision 15287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 16:50:11 +00:00
Vitor Sessak
42fe17a018 Check output buffer size before decoding.
Originally committed as revision 15257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 20:21:15 +00:00
Vitor Sessak
d636f0cc39 Cosmetics: rename vars s/ctx/chd/
Originally committed as revision 15256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 20:18:18 +00:00
Vitor Sessak
f36aec3b5e Exploit symmetry to reduce size of tables by half.
Originally committed as revision 15255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 17:20:55 +00:00
Vitor Sessak
b8a5f62144 Cosmetics: s/short/int16_t/
Originally committed as revision 15253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 14:33:01 +00:00
Vitor Sessak
b1547a7817 Remove cast, now tables are signed.
Originally committed as revision 15252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 14:32:10 +00:00
Vitor Sessak
fc1d3e004f Convert tables to signed and decimal.
Originally committed as revision 15251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 14:30:54 +00:00
Vitor Sessak
e7ff335935 Remove unused table entries.
Originally committed as revision 15250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:55:26 +00:00
Vitor Sessak
934bc927a8 Remove commented out code.
Originally committed as revision 15249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:47:30 +00:00
Vitor Sessak
f9f7210e5e Use FFMIN() instead of rewriting it.
Originally committed as revision 15248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:46:09 +00:00
Vitor Sessak
42c7aeea67 Factorize broken clipping in its own function and document it.
Originally committed as revision 15247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 13:42:34 +00:00
Vitor Sessak
5659156760 Cosmetics: whitespace/linebreaks
Originally committed as revision 15246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:55:47 +00:00
Vitor Sessak
c8e0861e49 Use the same 8 bit -> 16 bit conversion as QuickTime.
Originally committed as revision 15245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:46:55 +00:00
Vitor Sessak
4ea70242a8 Do not share context variables between channels and do not zero them at
decode_frame(). This makes the output much closer to that of the binary decoder.

Originally committed as revision 15244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:42:57 +00:00
Vitor Sessak
b6d544f54e Remove output pointer from context
Originally committed as revision 15243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:38:37 +00:00
Vitor Sessak
e10049bef5 Cosmetics: indent after last commit and remove useless braces
Originally committed as revision 15214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:01:23 +00:00
Vitor Sessak
1b0dc0120d Simplify: use a for instead of unrolling by hand
Originally committed as revision 15213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:00:20 +00:00
Vitor Sessak
fb17d9ff54 Functions mace{3,6}_decode_frame() are just wrappers to Exp1to{3,6}(). This commit
moves the code of Exp1to* to the decode functions.

Originally committed as revision 15212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:54:57 +00:00
Vitor Sessak
78df225866 Simplify: use two distinct functions to decode MACE3 and MACE6, since the
previous mace_decode_init() function was almost just a switch statement.

Originally committed as revision 15208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:18:28 +00:00
Vitor Sessak
b97c413832 Simplify mace_decode_frame()
Originally committed as revision 15207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:12:20 +00:00
Vitor Sessak
647148c638 Remove useless comments
Originally committed as revision 15205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:02:08 +00:00
Vitor Sessak
251d75f292 Reindent mace.c, its indentation was completly inconsistent with the coding rules.
Originally committed as revision 15204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:00:34 +00:00
Peter Ross
fd76c37fd9 Modify all codecs to report their supported input and output sample format(s).
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00