ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 29 Apr 2012 19:45:41 +0000 (21:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  4xm: fix invalid array indexing
  rv34dsp: factorize a multiplication in the noround inverse transform
  rv40: perform bitwise checks in loop filter
  rv34: remove inline keyword from rv34_decode_block().
  rv40: change a logical test into a bitwise one.
  rv34: remove constant parameter
  rv40: don't always do the full prev_type search
  dsputil x86: revert a test back to its previous value
  rv34dsp x86: implement MMX2 inverse transform

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/buffersink: fix header inclusion guard name
Stefano Sabatini [Sun, 29 Apr 2012 16:43:32 +0000 (18:43 +0200)]
lavfi/buffersink: fix header inclusion guard name

7 years agoSimplify camstudio decoding and fix odd 16bit decoding.
Carl Eugen Hoyos [Sun, 29 Apr 2012 16:35:39 +0000 (18:35 +0200)]
Simplify camstudio decoding and fix odd 16bit decoding.

Fixes ticket #1220.

7 years agoswr: use memcpy when input and output match
Michael Niedermayer [Sun, 29 Apr 2012 13:28:16 +0000 (15:28 +0200)]
swr: use memcpy when input and output match

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add sample format to AudioData
Michael Niedermayer [Sun, 29 Apr 2012 13:30:07 +0000 (15:30 +0200)]
swr: add sample format to AudioData

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add set_audiodata_fmt() and use it to simplify code
Michael Niedermayer [Sun, 29 Apr 2012 13:29:28 +0000 (15:29 +0200)]
swr: add set_audiodata_fmt() and use it to simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: int32_to_int16_mmx/sse
Michael Niedermayer [Sun, 29 Apr 2012 12:10:34 +0000 (14:10 +0200)]
swr: int32_to_int16_mmx/sse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agormenc: more than 2 streams are not currently possible.
Reimar Döffinger [Sat, 28 Apr 2012 22:08:36 +0000 (00:08 +0200)]
rmenc: more than 2 streams are not currently possible.

It is possible that just extending the RMMuxContext.streams
array would avoid it.
It is also possible that two audio streams will fail to mux
correctly as well, though at least it should not crash for
this reason.
I do not feel like checking either of these.
This patch fixes trac issue #1022 (at least it makes it
exit with a proper error message instead of crashing).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agonutdec: minor simplification.
Reimar Döffinger [Sat, 28 Apr 2012 19:14:03 +0000 (21:14 +0200)]
nutdec: minor simplification.

Also fixes an (incorrect) "control reaches end of non-void function"
warning with some compilers.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agonutdec: replace assert with av_assert0.
Reimar Döffinger [Sat, 28 Apr 2012 19:11:38 +0000 (21:11 +0200)]
nutdec: replace assert with av_assert0.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoswr: float_to_int16_sse2()
Michael Niedermayer [Sun, 29 Apr 2012 10:18:14 +0000 (12:18 +0200)]
swr: float_to_int16_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: float_to_int32_sse2()
Michael Niedermayer [Sun, 29 Apr 2012 09:27:22 +0000 (11:27 +0200)]
swr: float_to_int32_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: fix invalid array indexing
Mans Rullgard [Sat, 28 Apr 2012 12:05:18 +0000 (13:05 +0100)]
4xm: fix invalid array indexing

Indexing outside arrays is invalid and breaks with gcc 4.8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 28 Apr 2012 18:45:06 +0000 (20:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: new assembly version of get_cabac for x86_64 with PIC
  h264: use one table instead of several for cabac functions
  h264: (trivial) remove unneeded macro argument in x86/cabac.h
  libschroedingerdec: check malloc
  segment: reorder seg_write_header allocation
  avio: make avio_close(NULL) a no-op
  mov: Parse EC3SpecificBox (dec3 atom).

Conflicts:
libavcodec/cabac.c
libavcodec/x86/cabac.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: minor bump for the new fields in AVFrame.
Nicolas George [Sat, 28 Apr 2012 18:32:40 +0000 (20:32 +0200)]
lavc: minor bump for the new fields in AVFrame.

7 years agorv34dsp: factorize a multiplication in the noround inverse transform
Christophe GISQUET [Tue, 17 Apr 2012 18:44:43 +0000 (18:44 +0000)]
rv34dsp: factorize a multiplication in the noround inverse transform

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agolavc: add a sample_rate field to AVFrame.
Nicolas George [Sat, 28 Apr 2012 12:07:50 +0000 (14:07 +0200)]
lavc: add a sample_rate field to AVFrame.

The field is filled with the codec context information.

7 years agolavc: add a channel_layout field to AVFrame.
Nicolas George [Sat, 28 Apr 2012 11:02:41 +0000 (13:02 +0200)]
lavc: add a channel_layout field to AVFrame.

The field is filled with the codec context information.

FIXME need a minor version bump.

7 years agorv40: perform bitwise checks in loop filter
Christophe Gisquet [Tue, 17 Apr 2012 18:44:51 +0000 (18:44 +0000)]
rv40: perform bitwise checks in loop filter

Down from 95 kcycles to 93 (including all called functions).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorv34: remove inline keyword from rv34_decode_block().
Ronald S. Bultje [Sat, 28 Apr 2012 18:10:57 +0000 (11:10 -0700)]
rv34: remove inline keyword from rv34_decode_block().

Force-inlining increases object size by 8kB and causes a 2% slowdown.

7 years agorv40: change a logical test into a bitwise one.
Christophe Gisquet [Tue, 17 Apr 2012 18:44:50 +0000 (18:44 +0000)]
rv40: change a logical test into a bitwise one.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorv34: remove constant parameter
Christophe Gisquet [Wed, 4 Apr 2012 08:22:28 +0000 (10:22 +0200)]
rv34: remove constant parameter

is_block2 was always 0, so just remove it, and change accordingly the code.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorv40: don't always do the full prev_type search
Christophe Gisquet [Tue, 17 Apr 2012 18:44:48 +0000 (18:44 +0000)]
rv40: don't always do the full prev_type search

120->100 cycles.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoh264: new assembly version of get_cabac for x86_64 with PIC
Roland Scheidegger [Fri, 27 Apr 2012 20:12:20 +0000 (22:12 +0200)]
h264: new assembly version of get_cabac for x86_64 with PIC

This adds a hand-optimized assembly version for get_cabac much like the
existing one, but it works if the table offsets are RIP-relative.
Compared to the non-RIP-relative version this adds 2 lea instructions
and it needs one extra register.
There is a surprisingly large performance improvement over the c version (more
so than the generated assembly seems to suggest) just in get_cabac, I measured
roughly 40% faster for get_cabac on a K8. However, overall the difference is
not that big, I measured roughly 5% on a test clip on a K8 and a Core2.
Hopefully it still compiles on x86 32bit...
Now that only one table is used, there's some chance even darwin as compiles
this (apparently the label arithmetic used previously doesn't work if it
involves symbols defined in a different file, thanks to Ronald S. Bultje for
helping me with this).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: use one table instead of several for cabac functions
Roland Scheidegger [Fri, 27 Apr 2012 20:12:19 +0000 (22:12 +0200)]
h264: use one table instead of several for cabac functions

The reason is this is easier for PIC code (in particular on darwin...).
Keep the old names as pointers (static in cabac_functions.h so gcc
knows these are just immediate offsets) so the c code can nicely stay the same
(alternatively could use offsets directly in the functions needing the
tables). This should produce the same code as before with non-pic and better
code (confirmed) with pic.

The assembly uses the new table but still won't work for PIC case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: (trivial) make ff_h264_lps_state static
Roland Scheidegger [Fri, 27 Apr 2012 20:12:18 +0000 (22:12 +0200)]
h264: (trivial) make ff_h264_lps_state static

not used outside the cabac test functions (which probably means it's
a bad test if it doesn't use the same tables as the real functions?)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: (trivial) remove unneeded macro argument in x86/cabac.h
Roland Scheidegger [Fri, 27 Apr 2012 20:12:17 +0000 (22:12 +0200)]
h264: (trivial) remove unneeded macro argument in x86/cabac.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil x86: revert a test back to its previous value
Christophe GISQUET [Wed, 28 Mar 2012 21:22:22 +0000 (23:22 +0200)]
dsputil x86: revert a test back to its previous value

Commit 356ee8d caused the initial inversion.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorv34dsp x86: implement MMX2 inverse transform
Christophe Gisquet [Thu, 29 Mar 2012 20:37:41 +0000 (22:37 +0200)]
rv34dsp x86: implement MMX2 inverse transform

141 cycles down to 51.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agosrc_buffer: add forgotten avfilter_unref_buffer.
Nicolas George [Sat, 28 Apr 2012 14:19:03 +0000 (16:19 +0200)]
src_buffer: add forgotten avfilter_unref_buffer.

7 years agoswr: add int16_to_float_sse2()
Michael Niedermayer [Sat, 28 Apr 2012 16:52:48 +0000 (18:52 +0200)]
swr: add int16_to_float_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf remove duplicated check in has_duration
Jean First [Sat, 28 Apr 2012 13:38:41 +0000 (15:38 +0200)]
lavf remove duplicated check in has_duration

this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a
few lines above since cdced09e. I removed the first check to reduce the differences
to libav.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: filter_samples: read pts before filtering.
Nicolas George [Fri, 27 Apr 2012 22:41:01 +0000 (00:41 +0200)]
avfilter: filter_samples: read pts before filtering.

The call to the next filter_sample will likely unref the
current buffer, so it is not possible to read it afterwards.

7 years agoh264: new assembly version of get_cabac for x86_64 with PIC
Roland Scheidegger [Fri, 27 Apr 2012 20:19:39 +0000 (22:19 +0200)]
h264: new assembly version of get_cabac for x86_64 with PIC

This adds a hand-optimized assembly version for get_cabac much like the
existing one, but it works if the table offsets are RIP-relative.
Compared to the non-RIP-relative version this adds 2 lea instructions
and it needs one extra register. get_cabac() gets about 40% faster, for
an overall speedup of about 5%.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoh264: use one table instead of several for cabac functions
Roland Scheidegger [Fri, 27 Apr 2012 20:19:38 +0000 (22:19 +0200)]
h264: use one table instead of several for cabac functions

The reason is this is easier for PIC code (in particular on darwin...).
Keep the old names as pointers (static in cabac_functions.h so gcc
knows these are just immediate offsets) so the c code can nicely stay the same
(alternatively could use offsets directly in the functions needing the
tables). This should produce the same code as before with non-pic and better
code (confirmed) with pic.

The assembly uses the new table but still won't work for PIC case.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoh264: (trivial) remove unneeded macro argument in x86/cabac.h
Roland Scheidegger [Fri, 27 Apr 2012 20:19:37 +0000 (22:19 +0200)]
h264: (trivial) remove unneeded macro argument in x86/cabac.h

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoswr: add int32_to_float_sse2
Michael Niedermayer [Sat, 28 Apr 2012 15:04:42 +0000 (17:04 +0200)]
swr: add int32_to_float_sse2

could be done for sse/3dnow too if someone wants

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: int16->int32: use the old index negate trick to avoid 2 adds
Michael Niedermayer [Sat, 28 Apr 2012 15:03:20 +0000 (17:03 +0200)]
swr: int16->int32: use the old index negate trick to avoid 2 adds

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: more correct cglobal parameters to int16->int32
Michael Niedermayer [Sat, 28 Apr 2012 15:02:04 +0000 (17:02 +0200)]
swr: more correct cglobal parameters to int16->int32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: change ffurl_alloc return code.
Nicolas George [Sat, 28 Apr 2012 09:01:38 +0000 (11:01 +0200)]
avio: change ffurl_alloc return code.

If the designated protocol is not found, return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).

7 years agolibschroedingerdec: check malloc
Jordi Ortiz [Thu, 26 Apr 2012 19:14:07 +0000 (21:14 +0200)]
libschroedingerdec: check malloc

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoswr: seperate functions for aligned & unaligned
Michael Niedermayer [Sat, 28 Apr 2012 11:01:50 +0000 (13:01 +0200)]
swr: seperate functions for aligned & unaligned

If someone has an idea on how to do this cleaner, its welcome

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add int16_to_int32_mmx/sse
Michael Niedermayer [Sat, 28 Apr 2012 10:23:42 +0000 (12:23 +0200)]
swr: add int16_to_int32_mmx/sse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: move AudioConvert to header
Michael Niedermayer [Sat, 28 Apr 2012 10:20:19 +0000 (12:20 +0200)]
swr: move AudioConvert to header

the next commits will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: change sample format representation so as to maintain the planer/packed distinction.
Michael Niedermayer [Sat, 28 Apr 2012 09:19:22 +0000 (11:19 +0200)]
swr: change sample format representation so as to maintain the planer/packed distinction.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with YASM/NASM without AVX support.
Reimar Döffinger [Sat, 28 Apr 2012 10:51:06 +0000 (12:51 +0200)]
Fix compilation with YASM/NASM without AVX support.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoexamples/filtering_audio: do not stop on decode error.
Nicolas George [Fri, 27 Apr 2012 21:46:09 +0000 (23:46 +0200)]
examples/filtering_audio: do not stop on decode error.

Decode errors can happen with concatenated MP3s
with different formats.

7 years agoexamples/filtering_audio: fix a memory leak.
Nicolas George [Fri, 27 Apr 2012 22:43:02 +0000 (00:43 +0200)]
examples/filtering_audio: fix a memory leak.

7 years agolavfi: rename vsrc_buffer.c into src_buffer.c.
Nicolas George [Fri, 27 Apr 2012 17:23:59 +0000 (19:23 +0200)]
lavfi: rename vsrc_buffer.c into src_buffer.c.

7 years agolavfi: merge asrc_abuffer into vsrc_buffer.
Nicolas George [Fri, 27 Apr 2012 17:19:45 +0000 (19:19 +0200)]
lavfi: merge asrc_abuffer into vsrc_buffer.

7 years agosegment: reorder seg_write_header allocation
Luca Barbato [Fri, 27 Apr 2012 18:09:30 +0000 (11:09 -0700)]
segment: reorder seg_write_header allocation

As pointed by Paul B Mahol <onemda@gmail.com> the previous code could
lead to null pointer dereference.

7 years agoavio: make avio_close(NULL) a no-op
Luca Barbato [Fri, 27 Apr 2012 17:53:04 +0000 (10:53 -0700)]
avio: make avio_close(NULL) a no-op

Its behaviour in line with ffurl_close(NULL).

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 27 Apr 2012 20:44:52 +0000 (22:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegts: Make sure we don't return uninitialized packets
  gitignore: replace library catch-all pattern by more specific patterns

Conflicts:
.gitignore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/tinterlace: remove unnecessary NULL check in start_frame()
Stefano Sabatini [Fri, 27 Apr 2012 20:21:22 +0000 (22:21 +0200)]
lavfi/tinterlace: remove unnecessary NULL check in start_frame()

7 years agolavfi/tinterlace: use avfilter_unref_bufferp()
Stefano Sabatini [Fri, 27 Apr 2012 20:16:06 +0000 (22:16 +0200)]
lavfi/tinterlace: use avfilter_unref_bufferp()

7 years agolavfi/tinterlace: fix doxy in copy_picture_field()
Stefano Sabatini [Fri, 27 Apr 2012 20:11:15 +0000 (22:11 +0200)]
lavfi/tinterlace: fix doxy in copy_picture_field()

7 years agomov: Parse EC3SpecificBox (dec3 atom).
Yusuke Nakamura [Mon, 30 May 2011 23:17:13 +0000 (08:17 +0900)]
mov: Parse EC3SpecificBox (dec3 atom).

Skip to parse fields for additional independent substreams and its
associated dependent substreams since libavcodec's E-AC-3 decoder does not
support them yet.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoasrc_abuffer: return EAGAIN if no frame is available
Matthieu Bouron [Thu, 26 Apr 2012 15:28:23 +0000 (17:28 +0200)]
asrc_abuffer: return EAGAIN if no frame is available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: create buffer reference in filters which need to access the ref later
Stefano Sabatini [Tue, 24 Apr 2012 22:25:18 +0000 (00:25 +0200)]
lavfi: create buffer reference in filters which need to access the ref later

Also add internal function ff_null_start_frame_keep_ref().

Fix crash when a following filter (e.g. settb) will unref the reference
passed by start_frame(), and then the reference is accessed in
end_frame() through inlink->cur_buf.

7 years agolavfi/bbox: add missing space between pts and x1 values in the log
Stefano Sabatini [Tue, 24 Apr 2012 22:24:27 +0000 (00:24 +0200)]
lavfi/bbox: add missing space between pts and x1 values in the log

7 years agolavc: add MicroDVD decoder.
Clément Bœsch [Sat, 14 Apr 2012 19:46:01 +0000 (21:46 +0200)]
lavc: add MicroDVD decoder.

Based on my MicroDVD->ASS conversion code from MPlayer
(sub/subassconvert.c).

7 years agolavf/microdvd: set packet duration.
Clément Bœsch [Sat, 14 Apr 2012 19:45:36 +0000 (21:45 +0200)]
lavf/microdvd: set packet duration.

7 years agompegts: Make sure we don't return uninitialized packets
Martin Storsjö [Sat, 21 Apr 2012 17:44:24 +0000 (20:44 +0300)]
mpegts: Make sure we don't return uninitialized packets

This fixes crashes, where the demuxer could return 0 even
if the returned AVPacket isn't initialized at all. This
could happen if running into EOF or running out of probesize
with non-seekable sources.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoparseutils: replace setenv() by putenv().
Nicolas George [Fri, 27 Apr 2012 13:12:52 +0000 (15:12 +0200)]
parseutils: replace setenv() by putenv().

putenv() seems to be more portable.

7 years agogitignore: replace library catch-all pattern by more specific patterns
Diego Biurrun [Thu, 26 Apr 2012 12:54:39 +0000 (14:54 +0200)]
gitignore: replace library catch-all pattern by more specific patterns

Ignoring all files that start with the name of a library matches some
files that are not generated.  So replace libfoo/libfoo* with patterns
for static and shared libraries, pkg-config and version files.

7 years agoswr-test: simplify prng code
Michael Niedermayer [Fri, 27 Apr 2012 10:23:40 +0000 (12:23 +0200)]
swr-test: simplify prng code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: fix syntax for durations and timestamps.
Nicolas George [Mon, 23 Apr 2012 12:56:01 +0000 (14:56 +0200)]
doc: fix syntax for durations and timestamps.

Omitting the seconds has not worked for a long time, if ever.
Omitting the minutes too is just nonsensical for a duration
(it is indistinguishable from just seconds).

7 years agoswr: unroll audioconvert core C function
Michael Niedermayer [Fri, 27 Apr 2012 02:53:56 +0000 (04:53 +0200)]
swr: unroll audioconvert core C function

36k->32k decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: audioconvert, mark some constants as floats.
Michael Niedermayer [Thu, 26 Apr 2012 22:22:57 +0000 (00:22 +0200)]
swr: audioconvert, mark some constants as floats.

idea from avr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: fix declaration statement ordering.
Michael Niedermayer [Thu, 26 Apr 2012 21:48:57 +0000 (23:48 +0200)]
swr-test: fix declaration statement ordering.

swr-test is now warning free.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: fix pointer type warnings
Michael Niedermayer [Thu, 26 Apr 2012 21:47:32 +0000 (23:47 +0200)]
swr-test: fix pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: fix unused var warnings
Michael Niedermayer [Thu, 26 Apr 2012 21:44:50 +0000 (23:44 +0200)]
swr-test: fix unused var warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test:indent
Michael Niedermayer [Thu, 26 Apr 2012 21:43:45 +0000 (23:43 +0200)]
swr-test:indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 26 Apr 2012 20:24:58 +0000 (22:24 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: fix invalid array indexing
  configure: add libavresample to rpath
  build: icc: silence some warnings
  fft-test: add option to set cpuflag mask
  cpu: recognise only cpu flag names pertinent to the architecture
  avutil: add av_parse_cpu_flags() function
  vp8: armv6: fix non-armv6t2 build
  vp8: armv6 optimisations
  vp8: arm: separate ARMv6 functions from NEON
  ARM: add some compatibility macros
  mov: support eac3 audio
  avf: fix faulty check in has_duration

Conflicts:
configure
doc/APIchanges
ffmpeg.c
libavcodec/arm/Makefile
libavcodec/arm/asm.S
libavcodec/arm/vp8dsp_armv6.S
libavcodec/arm/vp8dsp_init_arm.c
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: support fabrices audiogen like avr
Michael Niedermayer [Thu, 26 Apr 2012 18:21:22 +0000 (20:21 +0200)]
swr-test: support fabrices audiogen like avr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: fix u8 zero point.
Michael Niedermayer [Thu, 26 Apr 2012 17:45:30 +0000 (19:45 +0200)]
swr-test: fix u8 zero point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: improve rounding in set()
Michael Niedermayer [Thu, 26 Apr 2012 17:39:40 +0000 (19:39 +0200)]
swr-test: improve rounding in set()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_amerge: return errors from subfilters when requesting a frame
Matthieu Bouron [Thu, 26 Apr 2012 15:43:00 +0000 (17:43 +0200)]
af_amerge: return errors from subfilters when requesting a frame

7 years agodsputil: fix invalid array indexing
Mans Rullgard [Thu, 26 Apr 2012 13:00:43 +0000 (14:00 +0100)]
dsputil: fix invalid array indexing

Indexing outside an array is invalid and causes errors with
gcc 4.8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswr-test: remove unneeded hack to test planar formats.
Michael Niedermayer [Thu, 26 Apr 2012 11:58:58 +0000 (13:58 +0200)]
swr-test: remove unneeded hack to test planar formats.

planar formats are now chosen like any other parameter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: improve output
Michael Niedermayer [Thu, 26 Apr 2012 11:05:17 +0000 (13:05 +0200)]
swr-test: improve output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: print channel layout, instead of just channel counts
Michael Niedermayer [Thu, 26 Apr 2012 10:17:29 +0000 (12:17 +0200)]
swr-test: print channel layout, instead of just channel counts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: Use randomized collision free hypercube corner enumeration to select tests.
Michael Niedermayer [Thu, 26 Apr 2012 10:14:28 +0000 (12:14 +0200)]
swr-test: Use randomized collision free hypercube corner enumeration to select tests.

This way the user can specify how many or few tests should run while
still providing good coverage over the whole parameter set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: use formats array
Michael Niedermayer [Thu, 26 Apr 2012 08:56:36 +0000 (10:56 +0200)]
swr-test: use formats array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: remove 0 terminator in layouts for consistency
Michael Niedermayer [Thu, 26 Apr 2012 08:35:45 +0000 (10:35 +0200)]
swr-test: remove 0 terminator in layouts for consistency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: add rates tables containing a new set of sample rates.
Michael Niedermayer [Thu, 26 Apr 2012 07:57:02 +0000 (09:57 +0200)]
swr-test: add rates tables containing a new set of sample rates.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: indent
Michael Niedermayer [Thu, 26 Apr 2012 07:55:14 +0000 (09:55 +0200)]
swr-test: indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: add sorted formats table from avr
Michael Niedermayer [Thu, 26 Apr 2012 07:54:01 +0000 (09:54 +0200)]
swr-test: add sorted formats table from avr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add libavresample to rpath
Sean McGovern [Thu, 26 Apr 2012 05:11:52 +0000 (06:11 +0100)]
configure: add libavresample to rpath

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoffv1: add examples of supported slices counts
Michael Niedermayer [Thu, 26 Apr 2012 02:35:30 +0000 (04:35 +0200)]
ffv1: add examples of supported slices counts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: pass resample parameters from the user to the resampler.
Michael Niedermayer [Wed, 25 Apr 2012 23:35:22 +0000 (01:35 +0200)]
swr: pass resample parameters from the user to the resampler.

doxy and names stolen from avr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: Add longer more descriptive alternative AVOptions.
Michael Niedermayer [Wed, 25 Apr 2012 23:14:48 +0000 (01:14 +0200)]
swr: Add longer more descriptive alternative AVOptions.

They match avresample where it supports the same fields.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: Capitalize help texts for AVOptions
Michael Niedermayer [Wed, 25 Apr 2012 23:03:32 +0000 (01:03 +0200)]
swr: Capitalize help texts for AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: align options a little
Michael Niedermayer [Wed, 25 Apr 2012 23:00:43 +0000 (01:00 +0200)]
swr: align options a little

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: set AV_OPT_FLAG_AUDIO_PARAM for the AVOptions
Michael Niedermayer [Wed, 25 Apr 2012 22:46:58 +0000 (00:46 +0200)]
swr: set AV_OPT_FLAG_AUDIO_PARAM for the AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: icc: silence some warnings
Mans Rullgard [Wed, 25 Apr 2012 20:15:39 +0000 (21:15 +0100)]
build: icc: silence some warnings

This disables the warning "external declaration in primary source file"
which is issued when a prototype for an extern function is found in a
.c file rather than a header file.  We have such prototypes for asm
functions where a separate header file would be pointless.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofft-test: add option to set cpuflag mask
Mans Rullgard [Wed, 25 Apr 2012 19:49:01 +0000 (20:49 +0100)]
fft-test: add option to set cpuflag mask

This can be useful for testing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agocpu: recognise only cpu flag names pertinent to the architecture
Mans Rullgard [Wed, 25 Apr 2012 17:11:33 +0000 (18:11 +0100)]
cpu: recognise only cpu flag names pertinent to the architecture

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavutil: add av_parse_cpu_flags() function
Mans Rullgard [Wed, 25 Apr 2012 17:06:51 +0000 (18:06 +0100)]
avutil: add av_parse_cpu_flags() function

This moves the cpu flag parsing code from avconv to avutil so
it can be accessed elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agovp8: armv6: fix non-armv6t2 build
Mans Rullgard [Wed, 25 Apr 2012 22:09:31 +0000 (23:09 +0100)]
vp8: armv6: fix non-armv6t2 build

The assembler may fail to place literal pools close enough to
instructions referencing them.  An explicit .ltorg directive
fixes this.

Signed-off-by: Mans Rullgard <mans@mansr.com>