ffmpeg.git
8 years agoMerge remote-tracking branch 'hexene/stagefright'
Michael Niedermayer [Thu, 13 Oct 2011 15:54:22 +0000 (17:54 +0200)]
Merge remote-tracking branch 'hexene/stagefright'

* hexene/stagefright:
  tools/build_libstagefright: fetch android system headers and libraries
  libstagefright: reindent after previous commit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoeval: add mathematical constants (PI, E, PHI).
Nicolas George [Thu, 13 Oct 2011 11:24:24 +0000 (13:24 +0200)]
eval: add mathematical constants (PI, E, PHI).

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agog723.1: use raw muxer
Mohamed Naufal [Thu, 13 Oct 2011 10:18:51 +0000 (15:48 +0530)]
g723.1: use raw muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 13 Oct 2011 02:55:40 +0000 (04:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffplay.c
ffprobe.c
libavcodec/ac3dec.c
libavcodec/h264.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavfilter/vf_drawtext.c
libavformat/flvdec.c
libavformat/mpegtsenc.c
libavformat/options.c
libavutil/avutil.h
libavutil/opt.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCorrect buffer handling for RTCP packets
John Brooks [Wed, 12 Oct 2011 06:53:12 +0000 (00:53 -0600)]
Correct buffer handling for RTCP packets

Previous code could read 4 bytes past the end of the buffer on a RTCP_SR
packet or offset a pointer by an unchecked external value (payload_len),
though neither will reliably cause a crash or other misbehavior beyond
garbage timestamps.

Additionally, unknown RTCP packet types, even in compounded packets, are
now ignored as per RFC 3550 section 6.1, page 22, though currently this
only has any practical effect if a sender puts an unrecognized type
before RTCP_BYE in a compounded packet, or (incorrectly) does not put
RTCP_SR first.

Signed-off-by: John Brooks <john.brooks@bluecherry.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotiffenc: initialize forgotten avctx.
Jean First [Fri, 23 Sep 2011 21:39:51 +0000 (23:39 +0200)]
tiffenc: initialize forgotten avctx.

8 years agoavplay: free the active audio packet at exit.
Justin Ruggles [Wed, 12 Oct 2011 18:44:02 +0000 (14:44 -0400)]
avplay: free the active audio packet at exit.

fixes a memleak

8 years agoavplay: free rdft data used for spectrogram analysis.
Justin Ruggles [Wed, 12 Oct 2011 18:38:02 +0000 (14:38 -0400)]
avplay: free rdft data used for spectrogram analysis.

fixes a memleak

8 years agolog.h: make AVClass a named struct
Jindrich Makovicka [Wed, 12 Oct 2011 20:30:56 +0000 (22:30 +0200)]
log.h: make AVClass a named struct

'struct AVClass' is used in the code since
641c7afe3c17334b81e3e2eef88f1751eb68f89f, but AVClass is typedeffed as
an anonymous struct.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoproresdsp: fix rounding
Michael Niedermayer [Wed, 12 Oct 2011 20:18:35 +0000 (22:18 +0200)]
proresdsp: fix rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresdsp: Correct credits to point to the Author and not just the code this is based on.
Michael Niedermayer [Wed, 12 Oct 2011 20:09:40 +0000 (22:09 +0200)]
proresdsp: Correct credits to point to the Author and not just the code this is based on.

Also change Libav to FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodct-test: Test ff_prores_idct_put_10_sse2()
Michael Niedermayer [Wed, 12 Oct 2011 20:02:54 +0000 (22:02 +0200)]
dct-test: Test ff_prores_idct_put_10_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodct-test: add transpose permutation support
Michael Niedermayer [Wed, 12 Oct 2011 20:01:44 +0000 (22:01 +0200)]
dct-test: add transpose permutation support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresdsp: Optimize series of padds out
Michael Niedermayer [Wed, 12 Oct 2011 19:59:44 +0000 (21:59 +0200)]
proresdsp: Optimize series of padds out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresdsp.asm: Remove useless instructions.
Michael Niedermayer [Wed, 12 Oct 2011 19:46:35 +0000 (21:46 +0200)]
proresdsp.asm: Remove useless instructions.

8 years agofix ac3 encoder documentation
Justin Ruggles [Tue, 11 Oct 2011 19:04:33 +0000 (15:04 -0400)]
fix ac3 encoder documentation

some of the mode values were reversed

8 years agoprores: change license to LGPL, merge some parts.
Elvis Presley [Wed, 12 Oct 2011 17:10:22 +0000 (19:10 +0200)]
prores: change license to LGPL, merge some parts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoproresdsp.asm: drop useless shifts
Elvis Presley [Wed, 12 Oct 2011 16:19:45 +0000 (18:19 +0200)]
proresdsp.asm: drop useless shifts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agox86/proresdsp-init: add forgotten HAVE_YASM
Elvis Presley [Wed, 12 Oct 2011 16:07:20 +0000 (18:07 +0200)]
x86/proresdsp-init: add forgotten HAVE_YASM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: drop GPLv2 support
Elvis Presley [Wed, 12 Oct 2011 14:12:22 +0000 (16:12 +0200)]
configure: drop GPLv2 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1: more prettyprinting cosmetics
Kostya Shishkov [Tue, 11 Oct 2011 09:59:57 +0000 (11:59 +0200)]
vc1: more prettyprinting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agovc1: prettyprint some tables
Kostya Shishkov [Tue, 11 Oct 2011 10:01:04 +0000 (12:01 +0200)]
vc1: prettyprint some tables

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agovc1: K&R formatting cosmetics
Kostya Shishkov [Tue, 11 Oct 2011 10:00:18 +0000 (12:00 +0200)]
vc1: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoAVOptions: bump minor and add APIchanges entry.
Anton Khirnov [Tue, 4 Oct 2011 06:13:40 +0000 (08:13 +0200)]
AVOptions: bump minor and add APIchanges entry.

8 years agocmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
Anton Khirnov [Tue, 4 Oct 2011 12:50:00 +0000 (14:50 +0200)]
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()

8 years agoAVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
Anton Khirnov [Tue, 4 Oct 2011 05:38:01 +0000 (07:38 +0200)]
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*

8 years agoRemove all uses of deprecated AVOptions API.
Anton Khirnov [Mon, 3 Oct 2011 19:10:06 +0000 (21:10 +0200)]
Remove all uses of deprecated AVOptions API.

8 years agoAVOptions: add av_opt_next, deprecate av_next_option.
Anton Khirnov [Mon, 3 Oct 2011 18:04:07 +0000 (20:04 +0200)]
AVOptions: add av_opt_next, deprecate av_next_option.

Just for naming consistency, no functional changes.

8 years agoAVOptions: add functions for evaluating option strings.
Anton Khirnov [Tue, 23 Aug 2011 13:02:25 +0000 (15:02 +0200)]
AVOptions: add functions for evaluating option strings.

8 years agoAVOptions: split get_number().
Anton Khirnov [Tue, 23 Aug 2011 12:25:56 +0000 (14:25 +0200)]
AVOptions: split get_number().

Split actual writing to read_number() in the same way as write_number().
Allows set_string_number() to write to a caller-provided destination.

8 years agoAVOptions: add av_opt_get*, deprecate av_get*.
Anton Khirnov [Mon, 5 Sep 2011 19:37:02 +0000 (21:37 +0200)]
AVOptions: add av_opt_get*, deprecate av_get*.

New functions can get values from child objects, properly report error
codes and have consistent naming and signatures.

8 years agoAVOptions: add av_opt_set*().
Anton Khirnov [Mon, 5 Sep 2011 06:15:32 +0000 (08:15 +0200)]
AVOptions: add av_opt_set*().

Deprecate av_set_*

New functions support setting values on children, return error codes
instead of options and have consistent naming and signatures.

8 years agoAVOptions: add new API for enumerating children.
Anton Khirnov [Mon, 3 Oct 2011 17:49:12 +0000 (19:49 +0200)]
AVOptions: add new API for enumerating children.

This will allow the caller to enumerate child contexts in a generic way
and since the API is recursive, it also allows for deeper nesting (e.g.
AVFormatContext->AVIOContext->URLContext)

This will also allow the new setting/reading API to transparently apply
to children contexts.

8 years agorv34: move inverse transform functions to DSP context
Janne Grunau [Sat, 24 Sep 2011 10:54:28 +0000 (12:54 +0200)]
rv34: move inverse transform functions to DSP context

8 years agodoc: small ascii diagram on I/O files and streams in ffmpeg.c
Clément Bœsch [Tue, 11 Oct 2011 14:04:34 +0000 (16:04 +0200)]
doc: small ascii diagram on I/O files and streams in ffmpeg.c

8 years agoffprobe: show sample_fmt in the stream section
Stefano Sabatini [Wed, 12 Oct 2011 12:53:56 +0000 (14:53 +0200)]
ffprobe: show sample_fmt in the stream section

8 years agoflvenc: Write the right metadata entry count
Martin Storsjö [Wed, 21 Sep 2011 13:58:07 +0000 (16:58 +0300)]
flvenc: Write the right metadata entry count

No application rely on this count being correct as far as
I know, but if we write a nonzero count value, it might just
as well be the right one.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Request that dynamic rate is disabled
Martin Storsjö [Mon, 27 Dec 2010 07:51:09 +0000 (09:51 +0200)]
rtsp: Request that dynamic rate is disabled

DSS enables this automatically if streaming VOD over TCP. If
enabled, the server feeds packets faster than realtime, screwing
up RTCP NTP based timestamps.

Also, DSS doesn't indicate that this was indicated, if it was
enabled automatically (although if it was requested to be enabled,
a header saying that it was enabled is added, but this isn't
added if it is enabled automatically), making it even harder
to detect and work around properly without explicitly asking
for it to be disabled(/enabled, if we were able to support it).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Parse the x-Accept-Dynamic-Rate header
Martin Storsjö [Sun, 2 Jan 2011 12:32:18 +0000 (14:32 +0200)]
rtsp: Parse the x-Accept-Dynamic-Rate header

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec: Add ff_ prefix to all nonstatic symbols
Martin Storsjö [Wed, 12 Oct 2011 09:37:42 +0000 (12:37 +0300)]
rtpdec: Add ff_ prefix to all nonstatic symbols

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoh264: change unsupported bit depth message to error level
Mans Rullgard [Wed, 12 Oct 2011 11:25:10 +0000 (12:25 +0100)]
h264: change unsupported bit depth message to error level

Unsupported bit depth is certainly an error the user will
want to know about.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agortpdec: Read the packet length for all RTCP packet types
John Brooks [Wed, 12 Oct 2011 06:53:12 +0000 (00:53 -0600)]
rtpdec: Read the packet length for all RTCP packet types

This allows skipping past unsupported RTCP packet types, as
RFC 3550 section 6.1 mandates.

Currently this only has any practical effect if a sender puts
an unrecognized type before RTCP_BYE in a compounded packet, or
(incorrectly) does not put RTCP_SR first.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec: Fix the minimum packet length for RTCP SR packets
John Brooks [Wed, 12 Oct 2011 08:06:26 +0000 (11:06 +0300)]
rtpdec: Fix the minimum packet length for RTCP SR packets

We actually read 20 bytes of these packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoqdm2: fix signed multiplication overflow
Mans Rullgard [Tue, 11 Oct 2011 16:45:55 +0000 (17:45 +0100)]
qdm2: fix signed multiplication overflow

This code relies on the result wrapping as for unsigned
values, and the sign is not used.  Thus an unsigned type
is proper here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoflvdec: Don't export metadata entries that aren't proper metadata
Martin Storsjö [Tue, 11 Oct 2011 21:03:20 +0000 (00:03 +0300)]
flvdec: Don't export metadata entries that aren't proper metadata

This avoids writing these entries doubly if transcoding from
flv to flv, since the muxer blindly writes any and all metadata
keys set, in addition to the fixed fields that the muxer
always writes.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoflvdec: Split out setting of numeric fields from storing metadata
Martin Storsjö [Tue, 11 Oct 2011 20:56:39 +0000 (23:56 +0300)]
flvdec: Split out setting of numeric fields from storing metadata

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibx264: support yuv422/444 output.
Anton Khirnov [Sun, 9 Oct 2011 17:34:20 +0000 (19:34 +0200)]
libx264: support yuv422/444 output.

8 years agosws: support yuv444p9/10 output.
Anton Khirnov [Sun, 9 Oct 2011 17:33:30 +0000 (19:33 +0200)]
sws: support yuv444p9/10 output.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Oct 2011 03:33:52 +0000 (05:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  fix AC3ENC_OPT_MODE_ON/OFF
  h264: fix HRD parameters parsing
  prores: implement multithreading.
  prores: idct sse2/sse4 optimizations.
  swscale: use aligned move for storage into temporary buffer.
  prores: extract idct into its own dspcontext and merge with put_pixels.
  h264: fix invalid shifts in init_cavlc_level_tab()
  intfloat_readwrite: fix signed addition overflows
  mov: do not misreport empty stts
  mov: cosmetics, fix for and if spacing
  id3v2: fix NULL pointer dereference
  mov: read album_artist atom
  mov: fix disc/track numbers and totals
  doc: fix references to obsolete presets directories for avconv/ffmpeg
  flashsv: return more meaningful error value
  flashsv: fix typo in av_log() message
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  smacker: Separate audio flags from sample rates in smacker demuxer.
  ...

Conflicts:
cmdutils.h
doc/ffmpeg.texi
libavcodec/Makefile
libavcodec/motion_est_template.c
libavformat/id3v2.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocdg: enable seeking
Michael Niedermayer [Wed, 12 Oct 2011 01:39:57 +0000 (03:39 +0200)]
cdg: enable seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocdg: Try to detect keyframes.
Michael Niedermayer [Wed, 12 Oct 2011 01:38:39 +0000 (03:38 +0200)]
cdg: Try to detect keyframes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocdg: set timestamps
Michael Niedermayer [Wed, 12 Oct 2011 01:38:08 +0000 (03:38 +0200)]
cdg: set timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: check stream_index from read_packet() for validity.
Michael Niedermayer [Tue, 11 Oct 2011 23:04:12 +0000 (01:04 +0200)]
lavf: check stream_index from read_packet() for validity.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopcm: Print number of bits in the error message of unsupported DVD PCM formats.
Daniel Kristjansson [Tue, 11 Oct 2011 22:47:43 +0000 (00:47 +0200)]
pcm: Print number of bits in the error message of unsupported DVD PCM formats.

8 years agoexamples/encoding: rename to decoding_encoding.c as the file is an example for both.
Michael Niedermayer [Tue, 11 Oct 2011 20:13:02 +0000 (22:13 +0200)]
examples/encoding: rename to decoding_encoding.c as the file is an example for both.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoexamples/encoding: List more formats to make it more clear to the reader what is...
Michael Niedermayer [Tue, 11 Oct 2011 20:10:26 +0000 (22:10 +0200)]
examples/encoding: List more formats to make it more clear to the reader what is not handled in libavcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomem: fix memalign hack av_realloc()
Michael Niedermayer [Tue, 11 Oct 2011 20:03:19 +0000 (22:03 +0200)]
mem: fix memalign hack av_realloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofix AC3ENC_OPT_MODE_ON/OFF
John Stebbins [Tue, 11 Oct 2011 18:57:58 +0000 (14:57 -0400)]
fix AC3ENC_OPT_MODE_ON/OFF

The values were reversed.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoarm: fix av_clipl_int32() asm
Michael Niedermayer [Tue, 11 Oct 2011 18:09:53 +0000 (20:09 +0200)]
arm: fix av_clipl_int32() asm

Note, the other arm asm code is likely affected too and should be changed as well.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: fix HRD parameters parsing
Mans Rullgard [Tue, 11 Oct 2011 15:00:21 +0000 (16:00 +0100)]
h264: fix HRD parameters parsing

The bit_rate_value_minus1 and cpb_size_value_minus1 elements
allow a wider range than get_ue_golomb() supports.  This
adds a get_ue_golomb_long() function supporting up to 31
leading zeros, which is the maximum for these syntax
elements, and uses it in decode_hrd_parameters().

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoprores: implement multithreading.
Ronald S. Bultje [Thu, 6 Oct 2011 14:17:44 +0000 (07:17 -0700)]
prores: implement multithreading.

60% speedup (overall decoding time) at 2 threads, and another 60%
speedup at 4 threads.

8 years agoprores: idct sse2/sse4 optimizations.
Ronald S. Bultje [Fri, 30 Sep 2011 12:37:11 +0000 (14:37 +0200)]
prores: idct sse2/sse4 optimizations.

~3.0-3.5x as fast as original C version, 1.6x as fast overall.

8 years agoswscale: use aligned move for storage into temporary buffer.
Ronald S. Bultje [Sun, 9 Oct 2011 04:40:01 +0000 (21:40 -0700)]
swscale: use aligned move for storage into temporary buffer.

The intermediate buffer is always aligned.

8 years agoprores: extract idct into its own dspcontext and merge with put_pixels.
Ronald S. Bultje [Thu, 6 Oct 2011 15:03:38 +0000 (08:03 -0700)]
prores: extract idct into its own dspcontext and merge with put_pixels.

8 years agoh264: fix invalid shifts in init_cavlc_level_tab()
Mans Rullgard [Tue, 11 Oct 2011 11:58:31 +0000 (12:58 +0100)]
h264: fix invalid shifts in init_cavlc_level_tab()

The level_code expression includes a shift which is invalid in
those cases where the value is not used.  Moving the calculation
to the branch where the result is used avoids these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agointfloat_readwrite: fix signed addition overflows
Mans Rullgard [Sat, 8 Oct 2011 01:16:29 +0000 (02:16 +0100)]
intfloat_readwrite: fix signed addition overflows

These additions might overflow the signed range for large
input values.  Converting to unsigned before the addition
rather than after avoids such undefined behaviour.  The
result under normal two's complement wraparound remains
unchanged.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agomov: do not misreport empty stts
Luca Barbato [Tue, 11 Oct 2011 08:14:06 +0000 (10:14 +0200)]
mov: do not misreport empty stts

Return -1 instead of ENOMEM if entries is 0.
Fixes a av_malloc(0) crash in macosx.

8 years agomov: cosmetics, fix for and if spacing
Luca Barbato [Tue, 11 Oct 2011 08:12:38 +0000 (10:12 +0200)]
mov: cosmetics, fix for and if spacing

8 years agoid3v2: fix NULL pointer dereference
Anton Khirnov [Fri, 7 Oct 2011 18:09:56 +0000 (20:09 +0200)]
id3v2: fix NULL pointer dereference

Bug found by Laurent Aimar fenrir at videolan org

8 years agomov: read album_artist atom
Raivo Hool [Tue, 11 Oct 2011 07:53:40 +0000 (10:53 +0300)]
mov: read album_artist atom

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomov: fix disc/track numbers and totals
Raivo Hool [Tue, 11 Oct 2011 07:53:39 +0000 (10:53 +0300)]
mov: fix disc/track numbers and totals

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodoc: fix references to obsolete presets directories for avconv/ffmpeg
Diego Biurrun [Thu, 29 Sep 2011 19:57:29 +0000 (21:57 +0200)]
doc: fix references to obsolete presets directories for avconv/ffmpeg

8 years agoflashsv: return more meaningful error value
Diego Biurrun [Wed, 28 Sep 2011 12:47:58 +0000 (14:47 +0200)]
flashsv: return more meaningful error value

8 years agoflashsv: fix typo in av_log() message
Diego Biurrun [Wed, 28 Sep 2011 12:47:31 +0000 (14:47 +0200)]
flashsv: fix typo in av_log() message

8 years agoffmpeg: fix two stream related comments.
Clément Bœsch [Tue, 11 Oct 2011 12:24:20 +0000 (14:24 +0200)]
ffmpeg: fix two stream related comments.

8 years agog723.1: use memmove() where overlapping src and dst can happen.
Michael Niedermayer [Tue, 11 Oct 2011 11:45:49 +0000 (13:45 +0200)]
g723.1: use memmove() where overlapping src and dst can happen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1: enable interlaced p fields again, they seem no longer to crash with out of...
Michael Niedermayer [Tue, 11 Oct 2011 11:06:30 +0000 (13:06 +0200)]
vc1: enable interlaced  p fields again, they seem no longer to crash with out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1: reset interlaced variables, prevent another bunch of crashes.
Michael Niedermayer [Tue, 11 Oct 2011 09:56:42 +0000 (11:56 +0200)]
vc1: reset interlaced variables, prevent another bunch of crashes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosmacker: validate channels and sample format.
Justin Ruggles [Wed, 21 Sep 2011 15:49:33 +0000 (11:49 -0400)]
smacker: validate channels and sample format.

8 years agosmacker: check buffer size before reading output size
Justin Ruggles [Wed, 21 Sep 2011 15:42:55 +0000 (11:42 -0400)]
smacker: check buffer size before reading output size

8 years agosmacker: validate number of channels
Justin Ruggles [Wed, 21 Sep 2011 15:37:51 +0000 (11:37 -0400)]
smacker: validate number of channels

8 years agosmacker: Separate audio flags from sample rates in smacker demuxer.
Justin Ruggles [Wed, 21 Sep 2011 15:34:26 +0000 (11:34 -0400)]
smacker: Separate audio flags from sample rates in smacker demuxer.

Makes the code easier to understand.

8 years agoh264: fix detection of optional trailing PPS elements
Mans Rullgard [Mon, 10 Oct 2011 23:58:03 +0000 (00:58 +0100)]
h264: fix detection of optional trailing PPS elements

The PPS may contain a few trailing elements whose presence is
only signalled by data remaining after the the mandatory part
has been parsed.  The current code fails to take into account
the rbsp_trailing_bits() when deciding whether to parse these
optional elements.  Assuming no unnecessary padding bytes are
passed to this function, the optional elements are present if
either more than 8 extra bits remain or the remaining bits do
not form a valid rbsp_trailing_bits() after the mandatory PPS
elements have been parsed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosipr: fix get_bits(0) calls
Mans Rullgard [Mon, 10 Oct 2011 19:41:31 +0000 (20:41 +0100)]
sipr: fix get_bits(0) calls

Zero-length get_bits() is undefined, must check before calling.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agomotion_est: make MotionExtContext.map_generation unsigned
Mans Rullgard [Sun, 9 Oct 2011 19:18:34 +0000 (20:18 +0100)]
motion_est: make MotionExtContext.map_generation unsigned

The way this value is used, it should be an unsigned type.
While the numerical value has no meaning, unsigned wraparound
is relied upon.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoeval: document recently added random(), hypot(), gcd().
Clément Bœsch [Sat, 8 Oct 2011 10:22:44 +0000 (12:22 +0200)]
eval: document recently added random(), hypot(), gcd().

8 years agovc1: disable parts of the interlaced code due to security issues.
Michael Niedermayer [Tue, 11 Oct 2011 01:42:51 +0000 (03:42 +0200)]
vc1: disable parts of the interlaced code due to security issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Oct 2011 00:39:50 +0000 (02:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (34 commits)
  h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
  error_resilience: fix the check for missing references in ff_er_frame_end() for H264
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  AVOptions: refactor set_number/write_number
  AVOptions: cosmetics, rename static av_set_number2() to write_number().
  AVOptions: cosmetics, move and rename static av_set_number().
  AVOptions: split av_set_string3 into opt type-specific functions
  avidec: fix signed overflow in avi_sync()
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  ...

Conflicts:
Changelog
configure
libavcodec/ptx.c
libavcodec/ra144.c
libavcodec/vaapi_vc1.c
libavcodec/vc1.c
libavcodec/version.h
libavformat/4xm.c
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: prefer lowercase section names over uppercase ones
Stefano Sabatini [Sat, 8 Oct 2011 22:38:34 +0000 (00:38 +0200)]
ffprobe: prefer lowercase section names over uppercase ones

This is consistent with chapter names. The default writer section names
are converted to uppercase for keeping backward compatibility.

8 years agoh264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
Laurent Aimar [Sun, 2 Oct 2011 14:03:47 +0000 (14:03 +0000)]
h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoerror_resilience: fix the check for missing references in ff_er_frame_end() for H264
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
error_resilience: fix the check for missing references in ff_er_frame_end() for H264

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years ago4xm: prevent NULL dereference with invalid huffman table
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xm: prevent NULL dereference with invalid huffman table

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years ago4xmdemux: prevent use of uninitialized memory
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xmdemux: prevent use of uninitialized memory

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years ago4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoptx: check for out of bound reads
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
ptx: check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agotiffdec: fix out of bound reads/writes
Laurent Aimar [Fri, 30 Sep 2011 23:42:33 +0000 (23:42 +0000)]
tiffdec: fix out of bound reads/writes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoeacmv: check for out of bound reads
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
eacmv: check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoeacmv: fix potential pointer arithmetic overflows
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
eacmv: fix potential pointer arithmetic overflows

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoadpcm: fix out of bound reads due to integer overflow
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
adpcm: fix out of bound reads due to integer overflow

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoanm: prevent infinite loop
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
anm: prevent infinite loop

Signed-off-by: Janne Grunau <janne-libav@jannau.net>