ffmpeg.git
6 years agolibavcodec/options_table: mark flags as also for subtitles
Michael Niedermayer [Sun, 5 Aug 2012 15:55:26 +0000 (17:55 +0200)]
libavcodec/options_table: mark flags as also for subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: fix typo in "@end table."
Stefano Sabatini [Sun, 5 Aug 2012 15:49:14 +0000 (17:49 +0200)]
doc/filters: fix typo in "@end table."

Remove erroneously added trailing dot.

6 years agomovenc: Fix unfreed memory found by valgrind.
Philip Langdale [Sun, 5 Aug 2012 15:26:49 +0000 (08:26 -0700)]
movenc: Fix unfreed memory found by valgrind.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agodoc/filters: add mandelbrot source documentation
Stefano Sabatini [Sun, 5 Aug 2012 09:22:54 +0000 (11:22 +0200)]
doc/filters: add mandelbrot source documentation

Address trac ticket #1492.

6 years agolavf/img2dec: add start_number_range option
Stefano Sabatini [Sun, 5 Aug 2012 08:04:02 +0000 (10:04 +0200)]
lavf/img2dec: add start_number_range option

6 years agoexamples/muxing: drop duplicated code in add_video_stream()
Stefano Sabatini [Fri, 3 Aug 2012 15:56:14 +0000 (17:56 +0200)]
examples/muxing: drop duplicated code in add_video_stream()

6 years agoconfigure: fix lib.exe check
Hendrik Leppkes [Sun, 5 Aug 2012 08:23:50 +0000 (10:23 +0200)]
configure: fix lib.exe check

Running lib.exe without parameters will always result in an error,
and failing the check.
Using the -list paramter results in a success if lib.exe is present.

6 years agooggdec: check stream index before using it in ogg_get_length()
Michael Niedermayer [Sun, 5 Aug 2012 02:41:34 +0000 (04:41 +0200)]
oggdec: check stream index before using it in ogg_get_length()

Fixes crash based on a uninitialized array index read.
If the read does not crash then out of array writes based
on the same index might have been triggered afterwards.

Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/demuxers.texi: avoid comma splice in image2 documentation
Stefano Sabatini [Sat, 4 Aug 2012 16:25:34 +0000 (18:25 +0200)]
doc/demuxers.texi: avoid comma splice in image2 documentation

Add "and" proposition for connecting two sentences.

6 years agolavf/img2doc: document options
Stefano Sabatini [Sat, 4 Aug 2012 11:04:40 +0000 (13:04 +0200)]
lavf/img2doc: document options

6 years agolavf/img2dec: improve error logging in case of find_image_range() failure
Stefano Sabatini [Sat, 4 Aug 2012 15:34:53 +0000 (17:34 +0200)]
lavf/img2dec: improve error logging in case of find_image_range() failure

6 years agolavf/img2dec: sort options by name
Stefano Sabatini [Sat, 4 Aug 2012 10:45:09 +0000 (12:45 +0200)]
lavf/img2dec: sort options by name

6 years agolavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in find_image_range
Stefano Sabatini [Sat, 4 Aug 2012 15:15:23 +0000 (17:15 +0200)]
lavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in find_image_range

6 years agolavf/img2dec: fix out-of-range check in find_image_range()
Stefano Sabatini [Sat, 4 Aug 2012 15:07:26 +0000 (17:07 +0200)]
lavf/img2dec: fix out-of-range check in find_image_range()

Take the new parameter start_index into account.

6 years agolavf/img2dec: doxygen find_image_range() function
Stefano Sabatini [Sat, 4 Aug 2012 15:06:05 +0000 (17:06 +0200)]
lavf/img2dec: doxygen find_image_range() function

6 years agolavf/img2dec: rename find_image_range() "max_start" parameter to "start_index"
Stefano Sabatini [Sat, 4 Aug 2012 15:04:04 +0000 (17:04 +0200)]
lavf/img2dec: rename find_image_range() "max_start" parameter to "start_index"

The new name seems more consistent with the assumed logic.

"start_index" represents the minimum accepted value as first index, and
not the maximum value as implicitely assumed by the previous name.

6 years agolavf/img2dec: fix weird start_number count logic
Stefano Sabatini [Sat, 4 Aug 2012 14:54:18 +0000 (16:54 +0200)]
lavf/img2dec: fix weird start_number count logic

This seems consistent with the assumed meaning of the option.

6 years agoexamples/muxing: simplify alloc_picture()
Stefano Sabatini [Fri, 3 Aug 2012 15:51:00 +0000 (17:51 +0200)]
examples/muxing: simplify alloc_picture()

Use avpicture_alloc() high level function.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 4 Aug 2012 20:39:25 +0000 (22:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix handling of custom mix matrices
  fate: force pix_fmt in lagarith-rgb32 test
  fate: add tests for lagarith lossless video codec.
  ARMv6: vp8: fix stack allocation with Apple's assembler
  ARM: vp56: allow inline asm to build with clang
  fft: 3dnow: fix register name typo in DECL_IMDCT macro
  x86: dct32: port to cpuflags
  x86: build: replace mmx2 by mmxext
  Revert "wmapro: prevent division by zero when sample rate is unspecified"
  wmapro: prevent division by zero when sample rate is unspecified
  lagarith: fix color plane inversion for YUY2 output.
  lagarith: pad RGB buffer by 1 byte.
  dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.

Conflicts:
doc/APIchanges
libavcodec/lagarith.c
libavfilter/x86/gradfun.c
libavutil/cpu.h
libavutil/version.h
libswscale/utils.c
libswscale/version.h
libswscale/x86/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: insert bitmap subtitles as video in filters.
Nicolas George [Thu, 26 Jul 2012 17:29:27 +0000 (19:29 +0200)]
ffmpeg: insert bitmap subtitles as video in filters.

With this feature, it becomes possible to perform commonly
requested tasks, such as hardcoding bitmap subtitles.

This will be reverted once libavfilter has proper support
for subtitles. All the changes have the string "sub2video"
in them, it makes it easy to spot the parts.

6 years agolavfi: document the constraints on incoming frames.
Nicolas George [Sun, 29 Jul 2012 16:58:42 +0000 (18:58 +0200)]
lavfi: document the constraints on incoming frames.

6 years agolavfi: use a new field for automatic buffer copy.
Nicolas George [Sun, 29 Jul 2012 16:43:45 +0000 (18:43 +0200)]
lavfi: use a new field for automatic buffer copy.

The code currently use cur_buf as the target of the copy,
but cur_buf can be cleared by the filter if it has given
the reference away or stored it elsewhere as soon as start_frame.

The code still relies on the fact that the reference is not
destroyed until end_frame. All filters currently follow that condition.
An av_assert1() is added to check it; it should at least cause
very visible errors in valgrind.

6 years agoMerge remote-tracking branch 'dwbuiten/master'
Michael Niedermayer [Sat, 4 Aug 2012 19:21:41 +0000 (21:21 +0200)]
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovtextenc: Remove dangling reference to movtext.h
Philip Langdale [Sat, 4 Aug 2012 19:19:46 +0000 (12:19 -0700)]
movtextenc: Remove dangling reference to movtext.h

This is a reference that leaked in from my future work to
support styling.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agozerocodec: Fix memleak in decode_frame
Derek Buitenhuis [Sat, 4 Aug 2012 02:13:43 +0000 (22:13 -0400)]
zerocodec: Fix memleak in decode_frame

If there was a failure inflating, or reinitializing
the zstream, the current frame's buffer would be lost.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agozerocodec: Cosmetics
Derek Buitenhuis [Sat, 4 Aug 2012 01:41:24 +0000 (21:41 -0400)]
zerocodec: Cosmetics

Be consistent with error messages and code formatting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavformat/srtdec: Write duration into packet from srt demuxer.
Philip Langdale [Sat, 2 Jun 2012 23:15:38 +0000 (16:15 -0700)]
avformat/srtdec: Write duration into packet from srt demuxer.

The current demuxer does not bother to write packet durations,
which makes it impossible to remux into a new format.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agomovenc: Handle need for extra packets to express subtitle duration.
Philip Langdale [Sun, 24 Jun 2012 22:05:33 +0000 (15:05 -0700)]
movenc: Handle need for extra packets to express subtitle duration.

As packet duration is not stored inherently in MPEG4 containers,
subtitles have their duration expressed by storing an additional
empty packet with a pts matching the desired end time of the real
subtitle. Additionally, it is generally expected that all streams
start at time = 0, so an empty packet needs to be inserted at the
beginning of the stream, before the first real subtitle.

Unfortunately, ffmpeg lacks a proper way to express that a subtitle
might map to multiple packets, so the muxer is the only place we
can handle this.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agomovtextenc: 3GPP TS 26.245 Timed Text Encoder.
Philip Langdale [Wed, 6 Jun 2012 16:12:24 +0000 (09:12 -0700)]
movtextenc: 3GPP TS 26.245 Timed Text Encoder.

This change introduces a basic encoder for 3GPP Timed Text subtitles,
also known as TX3G, Quicktime subtitles, or "movtext" in the existing
code.

This initial change doesn't attempt to write styling information,
and just writes the plain text of the subtitles. I intend to add
support for styles eventually, but it's challenging due to a lack
of existing players that support them.

Note that an additional change is required to the mov/mp4 muxer to
write empty subtitle packets to indicate subtitle duration.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agompegdemux: support MLP/AOB
Michael Niedermayer [Tue, 31 Jul 2012 18:54:33 +0000 (20:54 +0200)]
mpegdemux: support MLP/AOB

Fixes issue1731

Based-on-patch-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegdemux: move private stream 1 handling out of mpegps_read_pes_header
Michael Niedermayer [Tue, 31 Jul 2012 17:43:20 +0000 (19:43 +0200)]
mpegdemux: move private stream 1 handling out of mpegps_read_pes_header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegdemux: remove redundant dvd audio code
Michael Niedermayer [Tue, 31 Jul 2012 17:20:00 +0000 (19:20 +0200)]
mpegdemux: remove redundant dvd audio code

This is almost a revert of: (the file from the report still works)

commit 80e58c6153249a40e47a20326b7626cbe0fcabd3
Author: Benoit Fouet <benoit.fouet@free.fr>
Date:   Wed Feb 11 11:09:36 2009 +0000

    Allow demuxing of audio substreams stored as 0x06 type.
    Fixes issue 725: MPEG2 PS with PCM audio.
    On behalf of Jai.

    Originally committed as revision 17150 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavr: fix handling of custom mix matrices
Justin Ruggles [Sun, 29 Jul 2012 23:22:19 +0000 (19:22 -0400)]
lavr: fix handling of custom mix matrices

Adds some validation for changing parameters after setting the matrix and
fixes a bug in the conversion path setup.

6 years agocompute_pkt_fields: do not attempt to calculate dts when the delay hasnt been estimated.
Michael Niedermayer [Sat, 4 Aug 2012 13:39:22 +0000 (15:39 +0200)]
compute_pkt_fields: do not attempt to calculate dts when the delay hasnt been estimated.

Fixes ticket1242

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: move nb_decoded_frames out of info.
Michael Niedermayer [Sat, 4 Aug 2012 13:38:05 +0000 (15:38 +0200)]
lavf: move nb_decoded_frames out of info.

This way the variable is available outside find_stream_info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohas_decode_delay_been_guessed: adjust value for has_b_frames=0
Michael Niedermayer [Sat, 4 Aug 2012 13:36:51 +0000 (15:36 +0200)]
has_decode_delay_been_guessed: adjust value for has_b_frames=0

needed for a mkv file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: move has_decode_delay_been_guessed() up to make it accessible to earlier functions
Michael Niedermayer [Sat, 4 Aug 2012 13:35:53 +0000 (15:35 +0200)]
lavf: move has_decode_delay_been_guessed() up to make it accessible to earlier functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: print num_reorder_frames in debug output
Michael Niedermayer [Sat, 4 Aug 2012 13:34:27 +0000 (15:34 +0200)]
h264: print num_reorder_frames in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: force pix_fmt in lagarith-rgb32 test
Mans Rullgard [Sat, 4 Aug 2012 11:24:23 +0000 (12:24 +0100)]
fate: force pix_fmt in lagarith-rgb32 test

This makes big and little endian systems use the same output
format.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofate: Rename FATE_SAMPLES make file variable to FATE_EXTERN
Alexander Strasser [Thu, 26 Jul 2012 22:41:36 +0000 (00:41 +0200)]
fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN

  Restore functionality to set the samples directory via the
FATE_SAMPLES environment variable . This is broken since commit
63dcd16 was merged.

  Additionally the name FATE_EXTERN is more suited as the current
FATE_SAMPLES make file variable does not carry the name of the
FATE samples or the name of the directory they are stored in, but
does contain the names of the FATE targets that need external
samples. That is samples that are not in the repository and are
not generated on the fly.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agofate: add tests for lagarith lossless video codec.
Ronald S. Bultje [Fri, 3 Aug 2012 03:45:29 +0000 (20:45 -0700)]
fate: add tests for lagarith lossless video codec.

Based on patch by Oana Stratulat <oanaandreeastratulat@gmail.com>.

6 years agoLICENSE: Document all GPL files
Derek Buitenhuis [Sat, 4 Aug 2012 01:29:38 +0000 (21:29 -0400)]
LICENSE: Document all GPL files

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: check element size against stream limit in ebml_parse_elem()
Michael Niedermayer [Sat, 4 Aug 2012 00:27:51 +0000 (02:27 +0200)]
matroskadec: check element size against stream limit in ebml_parse_elem()

Fixes Ticket1195

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoARMv6: vp8: fix stack allocation with Apple's assembler
Mans Rullgard [Thu, 2 Aug 2012 22:18:08 +0000 (23:18 +0100)]
ARMv6: vp8: fix stack allocation with Apple's assembler

In the GNU assembler, a relational expression, bizarrely, has the
value -1 if true, whereas in Apple's it is +1.  This patch makes
sure the correct expression is used in both cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: vp56: allow inline asm to build with clang
Mans Rullgard [Thu, 2 Aug 2012 21:53:47 +0000 (22:53 +0100)]
ARM: vp56: allow inline asm to build with clang

The clang integrated assembler does not support pre-UAL syntax,
while gcc requires pre-UAL syntax for ARM code.  A patch[1] for
clang to support the old syntax as well has been ignored since
January.

This patch chooses the syntax appropriate for each compiler,
allowing both to build the code.  Notably, this change allows
building for iphone with the latest Apple Xcode update.

[1] http://llvm.org/bugs/show_bug.cgi?id=11855

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofft: 3dnow: fix register name typo in DECL_IMDCT macro
Ronald S. Bultje [Fri, 3 Aug 2012 21:59:16 +0000 (14:59 -0700)]
fft: 3dnow: fix register name typo in DECL_IMDCT macro

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agomotion_est_template: switch to av_assert
Michael Niedermayer [Fri, 3 Aug 2012 22:06:20 +0000 (00:06 +0200)]
motion_est_template: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodvdec: switch to av_assert
Michael Niedermayer [Fri, 3 Aug 2012 22:05:56 +0000 (00:05 +0200)]
dvdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog732_1: reduce difference to qatar
Michael Niedermayer [Fri, 3 Aug 2012 21:50:09 +0000 (23:50 +0200)]
g732_1: reduce difference to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 3 Aug 2012 20:43:44 +0000 (22:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1dec: Remove separate scaling function for interlaced field MVs
  vc1dec: Invoke edge_emulation regardless of MV precision
  x86: Use consistent 3dnowext function and macro name suffixes
  g723_1: scale output as supposed for the case with postfilter disabled
  g723_1: increase excitation storage by 4
  g723_1: fix upper bound parameter from inverse maximum autocorrelation
  g723_1: make scale_vector() behave like the reference
  g723_1: fix off-by-one error in normalize_bits()
  g723_1: save/restore excitation with offset to store LPC history
  wmapro: prevent division by zero when sample rate is unspecified
  x86: proresdsp: improve SIGNEXTEND macro comments
  x86: h264dsp: K&R formatting cosmetics
  LICENSE: Document all GPL files

Conflicts:
libavcodec/g723_1.c
libavcodec/wmaprodec.c
libavcodec/x86/h264dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: dct32: port to cpuflags
Diego Biurrun [Wed, 1 Aug 2012 17:28:08 +0000 (19:28 +0200)]
x86: dct32: port to cpuflags

6 years agox86: build: replace mmx2 by mmxext
Diego Biurrun [Sun, 8 Jul 2012 16:42:12 +0000 (18:42 +0200)]
x86: build: replace mmx2 by mmxext

Refactoring mmx2/mmxext YASM code with cpuflags will force renames.
So switching to a consistent naming scheme beforehand is sensible.
The name "mmxext" is more official and widespread and also the name
of the CPU flag, as reported e.g. by the Linux kernel.

6 years agolibopenjpegdec: increase max lowres from 5 to 31
Michael Bradshaw [Fri, 3 Aug 2012 14:07:48 +0000 (08:07 -0600)]
libopenjpegdec: increase max lowres from 5 to 31

OpenJPEG doesn't have a particular limit

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "wmapro: prevent division by zero when sample rate is unspecified"
Ronald S. Bultje [Fri, 3 Aug 2012 19:06:38 +0000 (12:06 -0700)]
Revert "wmapro: prevent division by zero when sample rate is unspecified"

This reverts commit 36936080239ba9e162f9f5d0f722ce579cb606cf. It was
already applied; no idea why it didn't error out while re-applying it.

6 years agowmapro: prevent division by zero when sample rate is unspecified
Sean McGovern [Thu, 2 Aug 2012 19:37:28 +0000 (15:37 -0400)]
wmapro: prevent division by zero when sample rate is unspecified

This fixes Bugzilla #327:

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agolagarith: fix color plane inversion for YUY2 output.
Ronald S. Bultje [Fri, 3 Aug 2012 03:46:08 +0000 (20:46 -0700)]
lagarith: fix color plane inversion for YUY2 output.

6 years agolagarith: pad RGB buffer by 1 byte.
Ronald S. Bultje [Fri, 3 Aug 2012 03:46:09 +0000 (20:46 -0700)]
lagarith: pad RGB buffer by 1 byte.

For left HFYU prediction, we predict from the buffer buf+1 using 8- or
16-byte reads. This means that aligning the buffer by 16 bytes is in
itself not sufficient, because if the width itself is 16- or 8-byte
aligned, the buffer will not be padded, and thus a read of size 16 at
buf+1 will overflow boundaries at the right edge. Padding the buffer by
1 byte is sufficient to not overflow its boundaries.

Fixes bug 342.

6 years agodsputil: make add_hfyu_left_prediction_sse4() support unaligned src.
Ronald S. Bultje [Fri, 3 Aug 2012 14:58:26 +0000 (16:58 +0200)]
dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.

This makes add_hfyu_left_prediction_sse4() handle sources that are not
16-byte aligned in its own function rather than by proxying the call to
add_hfyu_left_prediction_ssse3(). This fixes a crash on Win64, since the
sse4 version clobberes xmm6, but the ssse3 version (which uses MMX regs)
does not restore it, thus leading to XMM clobbering and RSP being off.

Fixes bug 342.

6 years agovc1dec: Remove separate scaling function for interlaced field MVs
Mashiat Sarker Shakkhar [Fri, 3 Aug 2012 14:53:36 +0000 (20:53 +0600)]
vc1dec: Remove separate scaling function for interlaced field MVs

The scaling process for obtaining direct MVs from co-located field MVs
is the same for interlaced field and progressive pictures.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agovc1dec: Invoke edge_emulation regardless of MV precision
Mashiat Sarker Shakkhar [Fri, 3 Aug 2012 14:53:35 +0000 (20:53 +0600)]
vc1dec: Invoke edge_emulation regardless of MV precision

In VC-1 interlaced field pictures, chroma motion vectors can extend beyond
picture boundary even if luma vectors are bounded. The problem shows up
only for hpel interpolated MVs, and may be due to the way motion vectors
are scaled / cropped.

Thanks to Konstantin Shishkov for suggesting the fix. This fixes
long-known segfaults in MC-VC1.ts from videolan streams archive.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agopaf: fix audio packet duration
Paul B Mahol [Fri, 3 Aug 2012 15:13:45 +0000 (15:13 +0000)]
paf: fix audio packet duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc/utils: rename ff_init_buffer_info() pic parameter to frame
Stefano Sabatini [Thu, 2 Aug 2012 11:14:15 +0000 (13:14 +0200)]
lavc/utils: rename ff_init_buffer_info() pic parameter to frame

The new name is more expressive, given that the frame is not necessarily
a picture but may be an audio frame.

6 years agolavc/utils: generalize ff_init_buffer_info() and use it when seems feasible
Stefano Sabatini [Thu, 2 Aug 2012 11:11:16 +0000 (13:11 +0200)]
lavc/utils: generalize ff_init_buffer_info() and use it when seems feasible

Extend ff_init_buffer_info() to init audio frames as well as video
frames.

Avoid code duplication.

6 years agolavfi: move color filter to testsrc, factorize
Stefano Sabatini [Tue, 31 Jul 2012 19:42:59 +0000 (21:42 +0200)]
lavfi: move color filter to testsrc, factorize

6 years agoFix misc swapped dot and carriage returns in av_log calls.
Clément Bœsch [Fri, 3 Aug 2012 12:56:31 +0000 (14:56 +0200)]
Fix misc swapped dot and carriage returns in av_log calls.

6 years agoflvdec: follow packets backward until a valid last timestamp is found
Michael Niedermayer [Fri, 3 Aug 2012 12:41:18 +0000 (14:41 +0200)]
flvdec: follow packets backward until a valid last timestamp is found

Fixed Ticket981

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflvdec: perform duration search just once
Michael Niedermayer [Fri, 3 Aug 2012 12:39:46 +0000 (14:39 +0200)]
flvdec: perform duration search just once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocllc: fix typo in the error message
Piotr Bandurski [Fri, 3 Aug 2012 11:43:57 +0000 (13:43 +0200)]
cllc: fix typo in the error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/movenc: fix invalid free with timecode meta and tmcd data copy.
Clément Bœsch [Fri, 3 Aug 2012 07:38:45 +0000 (09:38 +0200)]
lavf/movenc: fix invalid free with timecode meta and tmcd data copy.

Fixes ticket 1577.

6 years agox86: Use consistent 3dnowext function and macro name suffixes
Diego Biurrun [Wed, 1 Aug 2012 13:31:43 +0000 (15:31 +0200)]
x86: Use consistent 3dnowext function and macro name suffixes

Currently there is a wild mix of 3dn2/3dnow2/3dnowext.  Switching to
"3dnowext", which is a more common name of the CPU flag, as reported
e.g. by the Linux kernel, unifies this.

6 years agog723_1: scale output as supposed for the case with postfilter disabled
Kostya Shishkov [Thu, 2 Aug 2012 17:34:53 +0000 (19:34 +0200)]
g723_1: scale output as supposed for the case with postfilter disabled

6 years agog723_1: increase excitation storage by 4
Kostya Shishkov [Thu, 2 Aug 2012 17:15:51 +0000 (19:15 +0200)]
g723_1: increase excitation storage by 4

Fixed codebook mode in 5300 rate may write up to SUBFRAME_LEN + 4 and
that is considered normal by the reference decoder. Without that additional
padding it might overwrite first elements of LPC history.

6 years agog723_1: fix upper bound parameter from inverse maximum autocorrelation
Kostya Shishkov [Thu, 2 Aug 2012 05:54:16 +0000 (07:54 +0200)]
g723_1: fix upper bound parameter from inverse maximum autocorrelation

6 years agog723_1: make scale_vector() behave like the reference
Kostya Shishkov [Thu, 2 Aug 2012 05:50:49 +0000 (07:50 +0200)]
g723_1: make scale_vector() behave like the reference

6 years agog723_1: fix off-by-one error in normalize_bits()
Kostya Shishkov [Thu, 2 Aug 2012 05:48:08 +0000 (07:48 +0200)]
g723_1: fix off-by-one error in normalize_bits()

6 years agog723_1: save/restore excitation with offset to store LPC history
Kostya Shishkov [Thu, 2 Aug 2012 05:42:44 +0000 (07:42 +0200)]
g723_1: save/restore excitation with offset to store LPC history

The same buffer with saved data is used later in LPC reconstruction, so
it should have some head space for LPC history.

6 years agowmapro: prevent division by zero when sample rate is unspecified
Sean McGovern [Thu, 2 Aug 2012 19:37:28 +0000 (15:37 -0400)]
wmapro: prevent division by zero when sample rate is unspecified

This fixes Bugzilla #327:

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agompegprobe: fix misdetection of mp3
Michael Niedermayer [Fri, 3 Aug 2012 00:45:07 +0000 (02:45 +0200)]
mpegprobe: fix misdetection of mp3

Fixes tikcet1524

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoamerge/astreamsync/pan: fix license boilerplate.
Nicolas George [Thu, 2 Aug 2012 17:28:55 +0000 (19:28 +0200)]
amerge/astreamsync/pan: fix license boilerplate.

The boilerplate states that the files are under LGPL,
but refer the user to the GPL at one place.
These files were (re)implemented specifically for FFmpeg.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 2 Aug 2012 20:25:07 +0000 (22:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fft: fix imdct_half() for AVX
  rtmppkt: Add missing libavcodec/bytestream.h include.
  rtmp: add functions for reading AMF values
  vc1dec: remove useless #include simple_idct.h
  dct-test: always link with aandcttab.o
  vp8: pack struct VP8ThreadData more efficiently
  x86: remove libmpeg2 mmx(ext) idct functions
  eamad: Use dsputils instead of a custom bswap16_buf
  Canopus Lossless decoder

Conflicts:
Changelog
LICENSE
libavcodec/avcodec.h
libavcodec/cllc.c
libavcodec/eamad.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: proresdsp: improve SIGNEXTEND macro comments
Diego Biurrun [Sun, 15 Jul 2012 22:01:00 +0000 (00:01 +0200)]
x86: proresdsp: improve SIGNEXTEND macro comments

6 years agofft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
Ronald S. Bultje [Wed, 1 Aug 2012 03:23:39 +0000 (20:23 -0700)]
fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.

64-bit CPUs always have SSE available, thus there is no need to compile
in the 3dnow functions. This results in smaller binaries.

6 years agoeamad: Use dsputils instead of its own bswap16_buf
Derek Buitenhuis [Wed, 1 Aug 2012 20:38:10 +0000 (16:38 -0400)]
eamad: Use dsputils instead of its own bswap16_buf

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacenc: switch to av_assert
Michael Niedermayer [Thu, 2 Aug 2012 19:58:17 +0000 (21:58 +0200)]
flacenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacdec: switch to av_assert
Michael Niedermayer [Thu, 2 Aug 2012 19:58:03 +0000 (21:58 +0200)]
flacdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: h264dsp: K&R formatting cosmetics
Diego Biurrun [Tue, 31 Jul 2012 11:18:20 +0000 (13:18 +0200)]
x86: h264dsp: K&R formatting cosmetics

6 years agoLICENSE: Document all GPL files
Derek Buitenhuis [Thu, 2 Aug 2012 16:09:09 +0000 (16:09 +0000)]
LICENSE: Document all GPL files

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agox86: fft: fix imdct_half() for AVX
Ronald S. Bultje [Thu, 2 Aug 2012 17:15:46 +0000 (12:15 -0500)]
x86: fft: fix imdct_half() for AVX

Some calculations were changed in b6a3849 to use mmsize, which was not correct
for the AVX version, which uses INIT_YMM and therefore has mmsize == 32.

Fixes Bug 341.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agortmppkt: Add missing libavcodec/bytestream.h include.
Alex Rønne Petersen [Thu, 2 Aug 2012 16:24:01 +0000 (16:24 +0000)]
rtmppkt: Add missing libavcodec/bytestream.h include.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agompegtsenc: Fix AC3 Sound issue with Blu-ray Players.
Kifayat ullah [Thu, 2 Aug 2012 14:01:56 +0000 (15:01 +0100)]
mpegtsenc: Fix AC3 Sound issue with Blu-ray Players.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoassdec: return EOF instead of EIO.
Nicolas George [Thu, 2 Aug 2012 09:21:20 +0000 (11:21 +0200)]
assdec: return EOF instead of EIO.

6 years agortmp: add functions for reading AMF values
Jordi Ortiz [Wed, 1 Aug 2012 09:25:19 +0000 (11:25 +0200)]
rtmp: add functions for reading AMF values

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovc1dec: remove useless #include simple_idct.h
Mans Rullgard [Wed, 1 Aug 2012 16:15:42 +0000 (17:15 +0100)]
vc1dec: remove useless #include simple_idct.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodct-test: always link with aandcttab.o
Mans Rullgard [Wed, 1 Aug 2012 13:32:19 +0000 (14:32 +0100)]
dct-test: always link with aandcttab.o

This allows building dct-test even if aandcttab.o is not pulled in
by any enabled codec.  The DCT with which these tables are used does
not use them directly, so building it without the tables is possible.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agovp8: pack struct VP8ThreadData more efficiently
Mans Rullgard [Wed, 1 Aug 2012 13:01:08 +0000 (14:01 +0100)]
vp8: pack struct VP8ThreadData more efficiently

Reordering the members in this struct reduces the holes required
to maintain alignment.  With this order, the only remaining, and
unavoidable, hole is 3 bytes following left_nnz.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: remove libmpeg2 mmx(ext) idct functions
Mans Rullgard [Wed, 1 Aug 2012 12:16:23 +0000 (13:16 +0100)]
x86: remove libmpeg2 mmx(ext) idct functions

These functions are not faster than other mmx implementations on
any hardware I have been able to test on, and they are horribly
inaccurate.  There is thus no reason to ever use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavfi/rgbtestsrc: use ff_fill_rgba_map() rather than a local copy
Stefano Sabatini [Thu, 2 Aug 2012 09:13:38 +0000 (11:13 +0200)]
lavfi/rgbtestsrc: use ff_fill_rgba_map() rather than a local copy

Also convert int rgba_map[4] to uint8_t rgba_map[4], as required by
ff_fill_rgba_map().

Simplify.

6 years agolavfi/drawutils: make ff_draw_color() accept a const rgba map
Stefano Sabatini [Wed, 1 Aug 2012 21:52:25 +0000 (23:52 +0200)]
lavfi/drawutils: make ff_draw_color() accept a const rgba map

6 years agolavfi/video: remove duplicated function ff_null_start_frame_keep_ref()
Stefano Sabatini [Thu, 2 Aug 2012 09:59:57 +0000 (11:59 +0200)]
lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

Semantic for the function ff_null_start_frame() was changed in
07bad27810cd, and it has now the same behavior of
ff_null_start_frame_keep_ref(), thus it makes no sense to keep both of
them.

6 years agovorbisdec: fix heap buffer overflow.
Michael Niedermayer [Thu, 2 Aug 2012 10:21:25 +0000 (12:21 +0200)]
vorbisdec: fix heap buffer overflow.

Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>