ffmpeg.git
8 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.

8 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>
8 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>
8 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.

8 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>
8 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>
8 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>
8 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).

8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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.

8 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.

8 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.

8 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>
8 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()

8 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()

8 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()

8 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>
8 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.

8 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

8 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).

8 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.

8 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>
8 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.

8 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.

8 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>
8 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).

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 25 Apr 2012 20:01:59 +0000 (22:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: use updated reference for aac-latm_stereo_to_51
  avconv: use libavresample
  Add libavresample
  FATE: avoid channel mixing in lavf-dv_fmt

Conflicts:
Changelog
Makefile
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
tests/lavf-regression.sh
tests/ref/lavf/dv_fmt
tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp8: armv6 optimisations
Mans Rullgard [Tue, 24 Apr 2012 00:57:33 +0000 (01:57 +0100)]
vp8: armv6 optimisations

Based on patch by Ronald S. Bultje <rsbultje@gmail.com>,
partially ported from libvpx.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agovp8: arm: separate ARMv6 functions from NEON
Mans Rullgard [Sun, 22 Apr 2012 14:14:12 +0000 (15:14 +0100)]
vp8: arm: separate ARMv6 functions from NEON

This is a preparation for complete ARMv6 optimisations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: add some compatibility macros
Mans Rullgard [Tue, 20 Mar 2012 17:04:54 +0000 (17:04 +0000)]
ARM: add some compatibility macros

This adds some macros simplifying Thumb and pre-v6T2 compatibility.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agomov: support eac3 audio
Hendrik Leppkes [Tue, 3 May 2011 15:22:13 +0000 (17:22 +0200)]
mov: support eac3 audio

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoavf: fix faulty check in has_duration
Luca Barbato [Wed, 25 Apr 2012 05:13:02 +0000 (22:13 -0700)]
avf: fix faulty check in has_duration

An invalid duration is AV_NOPTS_VALUE not 0.

8 years agoffv1: remove clear_state(), it has become unused
Michael Niedermayer [Wed, 25 Apr 2012 16:04:45 +0000 (18:04 +0200)]
ffv1: remove clear_state(), it has become unused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: move clear_state() to clear_slice_state() in encoding threads
Michael Niedermayer [Wed, 25 Apr 2012 16:02:43 +0000 (18:02 +0200)]
ffv1: move clear_state() to clear_slice_state() in encoding threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: indent
Michael Niedermayer [Wed, 25 Apr 2012 15:51:17 +0000 (17:51 +0200)]
ffv1: indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: move init_slice_state() into the decoder threads.
Michael Niedermayer [Wed, 25 Apr 2012 15:50:55 +0000 (17:50 +0200)]
ffv1: move init_slice_state() into the decoder threads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: Remove slice count field with 1.3 and just count slices.
Michael Niedermayer [Wed, 25 Apr 2012 13:01:32 +0000 (15:01 +0200)]
ffv1: Remove slice count field with 1.3 and just count slices.

This field was problematic because in case of damaged slices it can be
lost

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: store slice size with all slices in 1.3
Michael Niedermayer [Wed, 25 Apr 2012 12:59:15 +0000 (14:59 +0200)]
ffv1: store slice size with all slices in 1.3

This simplifies handling by removing a special case.
Its also needed to make the next change possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: add 1 status byte to slices in in case crcs are stored too.
Michael Niedermayer [Wed, 25 Apr 2012 10:05:06 +0000 (12:05 +0200)]
ffv1: add 1 status byte to slices in in case crcs are stored too.

This will allow storing of information about corrected and uncorrectable
errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: Always store slice size when error reobustness is enabled.
Michael Niedermayer [Wed, 25 Apr 2012 10:01:44 +0000 (12:01 +0200)]
ffv1: Always store slice size when error reobustness is enabled.

This simplifies finding slices within a damaged bitstream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: include solution hint in the slice error message
Michael Niedermayer [Wed, 25 Apr 2012 09:21:30 +0000 (11:21 +0200)]
ffv1: include solution hint in the slice error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFATE: use updated reference for aac-latm_stereo_to_51
Justin Ruggles [Mon, 23 Apr 2012 18:03:25 +0000 (14:03 -0400)]
FATE: use updated reference for aac-latm_stereo_to_51

This uses correct stereo to 5.1 upmixing via libavresample.

8 years agoavconv: use libavresample
Justin Ruggles [Thu, 5 Apr 2012 18:06:28 +0000 (14:06 -0400)]
avconv: use libavresample

8 years agoAdd libavresample
Justin Ruggles [Fri, 23 Mar 2012 21:42:17 +0000 (17:42 -0400)]
Add libavresample

This is a new library for audio sample format, channel layout, and sample rate
conversion.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 24 Apr 2012 21:44:56 +0000 (23:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: fix a segfault on -c copy with -filter_complex.
  isom: Support more DTS codec identifiers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: support vlc mode in 1.3
Michael Niedermayer [Tue, 24 Apr 2012 21:28:37 +0000 (23:28 +0200)]
ffv1: support vlc mode in 1.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: move the decoder side ac->vlc switch to decode_slice()
Michael Niedermayer [Tue, 24 Apr 2012 21:27:47 +0000 (23:27 +0200)]
ffv1: move the decoder side ac->vlc switch to decode_slice()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: allow selecting 1.3 by using -level
Michael Niedermayer [Tue, 24 Apr 2012 21:05:16 +0000 (23:05 +0200)]
ffv1: allow selecting 1.3 by using -level

Note, 1.3 is not finalized and the bitstream will still change
do not use it yet. This option is just to make playing with it
easier, otherwise one would have to edit the source

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: move ac->vlc switch to encode_slice()
Michael Niedermayer [Tue, 24 Apr 2012 20:54:50 +0000 (22:54 +0200)]
ffv1: move ac->vlc switch to encode_slice()

This will allow us to use vlc coding in 1.3 too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFATE: avoid channel mixing in lavf-dv_fmt
Justin Ruggles [Tue, 24 Apr 2012 19:50:20 +0000 (15:50 -0400)]
FATE: avoid channel mixing in lavf-dv_fmt

This partially reverts acb1730218f1c614dc8ca3ba45d9de1e05059515
which would only have needed to change the checksums if channel mixing had
been properly avoided. This changes the output file size reference and the
seek test reference back to the previous values.

8 years agoparseutils: reliably detect out-of-range alpha.
Reimar Döffinger [Tue, 24 Apr 2012 18:18:57 +0000 (20:18 +0200)]
parseutils: reliably detect out-of-range alpha.

This should fix the FATE test on ARM (not tested),
but it should also detect alpha values like 2^128
reliably as invalid which would be another out-of-range
case with implementation-dependant behaviour.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoffmpeg: Fix initial dts for streamcopy, if the input packets lack dts.
Michael Niedermayer [Tue, 24 Apr 2012 16:44:51 +0000 (18:44 +0200)]
ffmpeg: Fix initial dts for streamcopy, if the input packets lack dts.

Fixes Ticket1138

Based on a patch by: Eelco Lempsink <eml@tupil.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd missing newline in shorten decoder.
Carl Eugen Hoyos [Tue, 24 Apr 2012 15:23:43 +0000 (17:23 +0200)]
Add missing newline in shorten decoder.

8 years agoavfiltergraph: fix format selection.
Nicolas George [Mon, 23 Apr 2012 14:55:11 +0000 (16:55 +0200)]
avfiltergraph: fix format selection.

The old code had two bugs:

For audio filters, the format was not set.

For video filters, if several links reference the same format list,
the same format must be selected in the end. This is done by
setting formats->format_count to 1: the other links sharing
the reference will therefore have only one choice.
If the heuristic does not pick the first format, the selected format
must also be moved to the first position.

8 years agoffmpeg: do not report EOF as an error.
Nicolas George [Tue, 24 Apr 2012 08:52:55 +0000 (10:52 +0200)]
ffmpeg: do not report EOF as an error.

Not all processing goes through filters,
so processing can continue even when
all filtergraphs have reached EOF on all sinks.

8 years agompc8: print error messages on maxband(s) errors
Michael Niedermayer [Tue, 24 Apr 2012 08:40:46 +0000 (10:40 +0200)]
mpc8: print error messages on maxband(s) errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompc8: make maxband check less picky.
Michael Niedermayer [Tue, 24 Apr 2012 08:40:00 +0000 (10:40 +0200)]
mpc8: make maxband check less picky.

Fixes Ticket1245

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: fix a segfault on -c copy with -filter_complex.
Anton Khirnov [Sat, 21 Apr 2012 05:03:06 +0000 (07:03 +0200)]
avconv: fix a segfault on -c copy with -filter_complex.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 23 Apr 2012 22:19:55 +0000 (00:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroska: Clear prev_pkt between seeks.
  avutil: change default buffer size alignment for sample buffer functions
  audemux: Add a sanity check for the number of channels
  Remove libdirac decoder.
  matroska: Add incremental parsing of clusters.
  avconv: fix off by one check in complex_filter
  mpegts: Try seeking back even for nonseekable protocols
  swscale: K&R formatting cosmetics (part III)

Conflicts:
configure
doc/general.texi
doc/platform.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavformat/au.c
libavformat/mpegts.c
libswscale/input.c
tests/ref/seek/lavf_mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavfiltergraph: free the sink_links heap.
Nicolas George [Mon, 23 Apr 2012 21:27:16 +0000 (23:27 +0200)]
avfiltergraph: free the sink_links heap.

8 years agoGet rid of tests/data/asynth-%.sw rule.
Reimar Döffinger [Mon, 23 Apr 2012 21:21:55 +0000 (23:21 +0200)]
Get rid of tests/data/asynth-%.sw rule.

This also avoids an issue with parallel make in some
cases never building asynth-16000-1.sw.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoindeo4: check quant_mat more fully.
Michael Niedermayer [Mon, 23 Apr 2012 19:40:02 +0000 (21:40 +0200)]
indeo4: check quant_mat more fully.

quant_mats valid range depends on the block size.
This fixes a global array overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>