ffmpeg.git
8 years agodiracdec: check dimensions against chroma format.
Michael Niedermayer [Fri, 7 Dec 2012 03:25:17 +0000 (04:25 +0100)]
diracdec: check dimensions against chroma format.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodiracdec: fix typo in mctmp allocation
Michael Niedermayer [Thu, 6 Dec 2012 23:43:40 +0000 (00:43 +0100)]
diracdec: fix typo in mctmp allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodiracdec: Test mctmp and mcscratch for malloc failure.
Michael Niedermayer [Thu, 6 Dec 2012 23:42:44 +0000 (00:42 +0100)]
diracdec: Test mctmp and mcscratch for malloc failure.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodiracdec: fix emulated_edge condition, fix out of array reads
Michael Niedermayer [Thu, 6 Dec 2012 23:27:08 +0000 (00:27 +0100)]
diracdec: fix emulated_edge condition, fix out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotakdec: use samplefmt.h from libavutil
Paul B Mahol [Fri, 7 Dec 2012 01:11:55 +0000 (01:11 +0000)]
takdec: use samplefmt.h from libavutil

Instead of having own code for calculating decoded buffer size
just use already provided functions from libavutil.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoadd missing dependency for tak demuxer
Paul B Mahol [Fri, 7 Dec 2012 00:14:33 +0000 (00:14 +0000)]
add missing dependency for tak demuxer

8 years agotakdec: remove get_code() and use get_sbits() directly
Paul B Mahol [Fri, 7 Dec 2012 00:03:47 +0000 (00:03 +0000)]
takdec: remove get_code() and use get_sbits() directly

As found by Justin, this is probably bug in reference decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoFix compilation with yasm 0.6.2.
Carl Eugen Hoyos [Thu, 6 Dec 2012 23:26:45 +0000 (00:26 +0100)]
Fix compilation with yasm 0.6.2.

8 years agofix tipo
Michael Niedermayer [Thu, 6 Dec 2012 21:21:52 +0000 (22:21 +0100)]
fix tipo

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/tinterlace: drop redundant NULL checks in uninit()
Stefano Sabatini [Thu, 6 Dec 2012 21:18:24 +0000 (22:18 +0100)]
lavfi/tinterlace: drop redundant NULL checks in uninit()

8 years agolavfi/tinterlace: add support to option parsing
Stefano Sabatini [Thu, 6 Dec 2012 21:03:02 +0000 (22:03 +0100)]
lavfi/tinterlace: add support to option parsing

Simplify code, and provide introspection through the AVOption system.

8 years agolavfi/tinterlace: switch to filter_frame API
Stefano Sabatini [Thu, 6 Dec 2012 13:40:36 +0000 (14:40 +0100)]
lavfi/tinterlace: switch to filter_frame API

Also add missing NULL checks.

8 years agolavf: improve help text for avoid_negative_ts
Michael Niedermayer [Thu, 6 Dec 2012 21:05:44 +0000 (22:05 +0100)]
lavf: improve help text for avoid_negative_ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobitstream: make vlc init of static tables thread safe.
Michael Niedermayer [Thu, 6 Dec 2012 20:45:26 +0000 (21:45 +0100)]
bitstream: make vlc init of static tables thread safe.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/mp: switch to ff_filter_frame.
Clément Bœsch [Sun, 2 Dec 2012 20:15:48 +0000 (21:15 +0100)]
lavfi/mp: switch to ff_filter_frame.

8 years agodxa: port to bytestream2 API
Paul B Mahol [Thu, 6 Dec 2012 18:38:07 +0000 (18:38 +0000)]
dxa: port to bytestream2 API

Protects against overreads in input buffer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosmacker: use meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 18:06:52 +0000 (18:06 +0000)]
smacker: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosiff: return meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 18:00:37 +0000 (18:00 +0000)]
siff: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavf/apedec: return meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 17:17:49 +0000 (17:17 +0000)]
lavf/apedec: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agohuffyuv: return meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 16:56:40 +0000 (16:56 +0000)]
huffyuv: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agohuffyuv: check for malloc failures
Paul B Mahol [Thu, 6 Dec 2012 16:44:43 +0000 (16:44 +0000)]
huffyuv: check for malloc failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agohuffyuv: make use of av_fast_padded_malloc()
Paul B Mahol [Thu, 6 Dec 2012 16:31:54 +0000 (16:31 +0000)]
huffyuv: make use of av_fast_padded_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi/deshake: small align prettifying.
Clément Bœsch [Thu, 6 Dec 2012 15:16:42 +0000 (16:16 +0100)]
lavfi/deshake: small align prettifying.

8 years agolavfi/deshake: switch inverted comments.
Clément Bœsch [Thu, 6 Dec 2012 15:15:03 +0000 (16:15 +0100)]
lavfi/deshake: switch inverted comments.

8 years agolavfi/deshake: remove unecessary check before unref.
Clément Bœsch [Thu, 6 Dec 2012 15:14:38 +0000 (16:14 +0100)]
lavfi/deshake: remove unecessary check before unref.

8 years agolavfi/deshake: switch to filter_frame.
Clément Bœsch [Thu, 6 Dec 2012 15:14:22 +0000 (16:14 +0100)]
lavfi/deshake: switch to filter_frame.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Dec 2012 15:03:13 +0000 (16:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: slice-mt: check master context for valid current_picture_ptr
  h264: slice-mt: get last_pic_dropable from master context
  alacenc: add support for multi-channel encoding

Conflicts:
Changelog
libavcodec/alac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
Michael Niedermayer [Thu, 6 Dec 2012 14:43:34 +0000 (15:43 +0100)]
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
  pixdesc: fix yuva 10bit bit depth
  avconv: deprecate the -vol option
  x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
  x86: af_volume: add SSE2-optimized s16 volume scaling

Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: rename af_volume to af_volume_stefano
Michael Niedermayer [Thu, 6 Dec 2012 14:29:23 +0000 (15:29 +0100)]
lavfi: rename af_volume to af_volume_stefano

This matches the naming style of the new af_volume_justin filter.

Note, Yes i would too prefer having one filter instead of 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
Michael Niedermayer [Thu, 6 Dec 2012 14:18:59 +0000 (15:18 +0100)]
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'

* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
  lavfi: add volume filter

Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavd/lavfi: fix float.h include.
Clément Bœsch [Thu, 6 Dec 2012 14:09:47 +0000 (15:09 +0100)]
lavd/lavfi: fix float.h include.

float.h is a system header.

8 years agolavfi/silencedetect: use eval builtin to parse dB.
Clément Bœsch [Thu, 6 Dec 2012 14:08:38 +0000 (15:08 +0100)]
lavfi/silencedetect: use eval builtin to parse dB.

Also update FATE test to use the dB form.

8 years agoMerge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'
Michael Niedermayer [Thu, 6 Dec 2012 13:33:38 +0000 (14:33 +0100)]
Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

* commit '9d5c62ba5b586c80af508b5914934b1c439f6652':
  lavu/opt: do not filter out the initial sign character except for flags
  eval: treat dB as decibels instead of decibytes
  float_dsp: add vector_dmul_scalar() to multiply a vector of doubles

Conflicts:
libavutil/eval.c
tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: add a concat demuxer.
Nicolas George [Wed, 22 Aug 2012 16:28:37 +0000 (18:28 +0200)]
lavf: add a concat demuxer.

8 years agolavfi/field: switch to filter_frame API
Stefano Sabatini [Thu, 6 Dec 2012 12:50:27 +0000 (13:50 +0100)]
lavfi/field: switch to filter_frame API

8 years agolavfi/drawtext: make use of outlink variable in filter_frame()
Stefano Sabatini [Thu, 6 Dec 2012 12:48:00 +0000 (13:48 +0100)]
lavfi/drawtext: make use of outlink variable in filter_frame()

Fix warning.

8 years agommfdec: fix seeking
Paul B Mahol [Mon, 3 Dec 2012 18:26:43 +0000 (18:26 +0000)]
mmfdec: fix seeking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi/mp: remove dead extern vf_info_t declarations.
Clément Bœsch [Thu, 6 Dec 2012 11:52:58 +0000 (12:52 +0100)]
lavfi/mp: remove dead extern vf_info_t declarations.

8 years agolavfi/mp: add ff_ prefix to exported symbols
anonymous [Tue, 4 Dec 2012 22:43:08 +0000 (23:43 +0100)]
lavfi/mp: add ff_ prefix to exported symbols

8 years agoAdd examples/resampling_audio to .gitignore.
Clément Bœsch [Thu, 6 Dec 2012 11:12:48 +0000 (12:12 +0100)]
Add examples/resampling_audio to .gitignore.

8 years agodoc/decoders: fix typo in "@Options"
Stefano Sabatini [Thu, 6 Dec 2012 09:16:10 +0000 (10:16 +0100)]
doc/decoders: fix typo in "@Options"

8 years agoexamples: add resampling_audio.c file
Stefano Sabatini [Fri, 30 Nov 2012 12:51:40 +0000 (13:51 +0100)]
examples: add resampling_audio.c file

8 years agoh264: slice-mt: check master context for valid current_picture_ptr
Janne Grunau [Wed, 5 Dec 2012 19:08:01 +0000 (20:08 +0100)]
h264: slice-mt: check master context for valid current_picture_ptr

Fixes errors in slice based multithreading introduced in 0b300daad2f5.

8 years agoh264: slice-mt: get last_pic_dropable from master context
Janne Grunau [Wed, 5 Dec 2012 18:56:36 +0000 (19:56 +0100)]
h264: slice-mt: get last_pic_dropable from master context

Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .

8 years agoff_lock_avcodec: make the lock state be consistent in case of failure.
Michael Niedermayer [Thu, 6 Dec 2012 01:21:11 +0000 (02:21 +0100)]
ff_lock_avcodec: make the lock state be consistent in case of failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavcodec_open: if obtaining a lock fails, dont attempt to unlock it.
Michael Niedermayer [Thu, 6 Dec 2012 01:00:12 +0000 (02:00 +0100)]
avcodec_open: if obtaining a lock fails, dont attempt to unlock it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "Acquire lock when initializing parsers."
Michael Niedermayer [Thu, 6 Dec 2012 00:35:44 +0000 (01:35 +0100)]
Revert "Acquire lock when initializing parsers."

This reverts commit 7feef7dbca5f6a816e04b63c17aad5dacd272f6e.

This commit causes assertion failures due to use of parser_init from multiple
threads, for example indirectly by ffmpeg.c and more directly from the
packet read functions.

I dont know how to fix this quickly, and fixing ffmpeg.c leaves
the possibility of other applications being affected.
Crashing the applications until this is resolved is clearly no good
thus this revert, so we have time to think about the problem.

Crashes can be reproduced by using multiple input files in ffmpeg.

8 years agoRevert "Add assert that the avcodec lock is held when initializing static VLC tables."
Michael Niedermayer [Thu, 6 Dec 2012 00:35:31 +0000 (01:35 +0100)]
Revert "Add assert that the avcodec lock is held when initializing static VLC tables."

This reverts commit dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4.

8 years agoframe_thread_encoder: fix locking while locks are held
Michael Niedermayer [Wed, 5 Dec 2012 22:46:59 +0000 (23:46 +0100)]
frame_thread_encoder: fix locking while locks are held

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1dec: prevent v_edge_pos from becoming negative.
Michael Niedermayer [Wed, 5 Dec 2012 22:16:21 +0000 (23:16 +0100)]
vc1dec: prevent v_edge_pos from becoming negative.

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoresample: remove disabled debug code
Michael Niedermayer [Wed, 5 Dec 2012 21:55:18 +0000 (22:55 +0100)]
resample: remove disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate/hqdn3d: add -idct simple.
Clément Bœsch [Wed, 5 Dec 2012 22:36:29 +0000 (23:36 +0100)]
fate/hqdn3d: add -idct simple.

This should fix FATE failure on ARM. IDCT is required since it's a JPEG
source.

8 years agoh264: slice-mt: check master context for valid current_picture_ptr
Janne Grunau [Wed, 5 Dec 2012 19:08:01 +0000 (20:08 +0100)]
h264: slice-mt: check master context for valid current_picture_ptr

Fixes errors in slice based multithreading introduced in 0b300daad2f5.

CC: libav-stable@libav.org
8 years agoh264: slice-mt: get last_pic_dropable from master context
Janne Grunau [Wed, 5 Dec 2012 18:56:36 +0000 (19:56 +0100)]
h264: slice-mt: get last_pic_dropable from master context

Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .

CC: libav-stable@libav.org
8 years agoswr: remove unused ONE define.
Clément Bœsch [Wed, 5 Dec 2012 19:27:33 +0000 (20:27 +0100)]
swr: remove unused ONE define.

8 years agoalacenc: add support for multi-channel encoding
Justin Ruggles [Tue, 4 Dec 2012 18:46:20 +0000 (13:46 -0500)]
alacenc: add support for multi-channel encoding

8 years agocafenc: do not include riff.h
Paul B Mahol [Wed, 5 Dec 2012 20:44:28 +0000 (20:44 +0000)]
cafenc: do not include riff.h

ff_codec_get_tag() was moved to internal.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavc/dxa: return meaningful error codes
Paul B Mahol [Wed, 5 Dec 2012 20:28:45 +0000 (20:28 +0000)]
lavc/dxa: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavf/dxa: return meaningful error codes
Paul B Mahol [Wed, 5 Dec 2012 20:18:04 +0000 (20:18 +0000)]
lavf/dxa: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agodxa: signal EOF
Paul B Mahol [Wed, 5 Dec 2012 20:02:34 +0000 (20:02 +0000)]
dxa: signal EOF

Fixes #1948.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoAdd assert that the avcodec lock is held when initializing static VLC tables.
Reimar Döffinger [Tue, 27 Nov 2012 20:58:22 +0000 (21:58 +0100)]
Add assert that the avcodec lock is held when initializing static VLC tables.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoAcquire lock when initializing parsers.
Reimar Döffinger [Tue, 27 Nov 2012 20:57:33 +0000 (21:57 +0100)]
Acquire lock when initializing parsers.

This is necessary since they might be initializing or
even using static VLC tables.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoavcodec: add ff_lock/unlock_avcodec functions.
Reimar Döffinger [Tue, 27 Nov 2012 20:56:35 +0000 (21:56 +0100)]
avcodec: add ff_lock/unlock_avcodec functions.

Will be used in future patches, together with the
variable that allows checking whether the lock is held.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agowmaenc: add new line to some error messages
Piotr Bandurski [Wed, 5 Dec 2012 16:37:42 +0000 (17:37 +0100)]
wmaenc: add new line to some error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo_parser: fix buffer access beyond end
Wolfram Gloger [Wed, 5 Dec 2012 18:26:12 +0000 (19:26 +0100)]
mpegvideo_parser: fix buffer access beyond end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_assert should use AV_LOG_PANIC.
Reimar Döffinger [Mon, 3 Dec 2012 19:42:08 +0000 (20:42 +0100)]
av_assert should use AV_LOG_PANIC.

The description of AV_LOG_PANIC 100% matches what av_assert
does, while AV_LOG_FATAL does not really.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agompegvideo_enc: use av_log() in debug code
Michael Niedermayer [Wed, 5 Dec 2012 18:31:10 +0000 (19:31 +0100)]
mpegvideo_enc: use av_log() in debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomotion_est: use av_log() in debug code
Michael Niedermayer [Wed, 5 Dec 2012 18:29:40 +0000 (19:29 +0100)]
motion_est: use av_log() in debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoj2kenc: remove duplicate debug functions
Michael Niedermayer [Wed, 5 Dec 2012 18:29:00 +0000 (19:29 +0100)]
j2kenc: remove duplicate debug functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoj2k: avoid printf() useage in debug code
Michael Niedermayer [Wed, 5 Dec 2012 18:27:46 +0000 (19:27 +0100)]
j2k: avoid printf() useage in debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: remove #if/define PARANOID code
Michael Niedermayer [Wed, 5 Dec 2012 18:26:02 +0000 (19:26 +0100)]
mpegvideo: remove #if/define PARANOID code

This code never did anything as far as i can remember

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: fix decode_frame() third parameter semantics for rest of video decoders
Paul B Mahol [Wed, 5 Dec 2012 18:24:43 +0000 (18:24 +0000)]
lavc: fix decode_frame() third parameter semantics for rest of video decoders

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopixdesc: fix yuva 10bit bit depth
Paul B Mahol [Wed, 5 Dec 2012 00:38:09 +0000 (00:38 +0000)]
pixdesc: fix yuva 10bit bit depth

It was wrongly set as the yuva 16bit one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Dec 2012 16:33:12 +0000 (17:33 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: workaround for slighly broken 'test' shell builtin
  mimic: initialize padding of swap_buf through av_fast_padded_malloc
  eamad: initialize padding of bitstream_buf through av_fast_padded_malloc()
  raw demuxer: initialize end of partial packets

Conflicts:
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: add volume filter
Justin Ruggles [Sat, 29 Sep 2012 04:38:13 +0000 (00:38 -0400)]
lavfi: add volume filter

Based on the volume filter in FFmpeg written by Stefano Sabatini
<stefasab@gmail.com>.

8 years agoavconv: deprecate the -vol option
Justin Ruggles [Tue, 2 Oct 2012 20:08:20 +0000 (16:08 -0400)]
avconv: deprecate the -vol option

Remove the code for volume scaling in avconv.c and instead auto-insert a
volume filter into the beginning of the filter chain.

8 years agox86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
Justin Ruggles [Tue, 25 Sep 2012 12:41:39 +0000 (08:41 -0400)]
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling

8 years agox86: af_volume: add SSE2-optimized s16 volume scaling
Justin Ruggles [Sun, 23 Sep 2012 18:49:26 +0000 (14:49 -0400)]
x86: af_volume: add SSE2-optimized s16 volume scaling

8 years agolavu/opt: do not filter out the initial sign character except for flags
Justin Ruggles [Sat, 29 Sep 2012 04:34:28 +0000 (00:34 -0400)]
lavu/opt: do not filter out the initial sign character except for flags

This allows parsing of special-case negative numbers like decibels.

8 years agoeval: treat dB as decibels instead of decibytes
Justin Ruggles [Fri, 28 Sep 2012 20:36:58 +0000 (16:36 -0400)]
eval: treat dB as decibels instead of decibytes

8 years agofloat_dsp: add vector_dmul_scalar() to multiply a vector of doubles
Justin Ruggles [Mon, 24 Sep 2012 19:00:53 +0000 (15:00 -0400)]
float_dsp: add vector_dmul_scalar() to multiply a vector of doubles

Include x86-optimized versions for SSE2 and AVX.

8 years agoMerge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'
Michael Niedermayer [Wed, 5 Dec 2012 16:15:57 +0000 (17:15 +0100)]
Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'

* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408':
  lavc: fix decode_frame() third parameter semantics for video decoders

Conflicts:
libavcodec/cscd.c
libavcodec/eamad.c
libavcodec/ffv1dec.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/iff.c
libavcodec/mjpegdec.c
libavcodec/pcx.c
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '387bef95d28019c13c6805cfa4079e59948284e5'
Michael Niedermayer [Wed, 5 Dec 2012 16:02:36 +0000 (17:02 +0100)]
Merge commit '387bef95d28019c13c6805cfa4079e59948284e5'

* commit '387bef95d28019c13c6805cfa4079e59948284e5':
  lavc: factorise setting buffer type in avcodec_default_get_buffer().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5'
Michael Niedermayer [Wed, 5 Dec 2012 15:25:03 +0000 (16:25 +0100)]
Merge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5'

* commit 'e57c4706e969afa1f2384481b955ccd9494cddb5':
  lavc: don't reuse audio buffers

This commit causes a 0.5% speedloss for mp3 and 2% for raw pcm, that is
"time ffmpeg" style tested thus includes disk IO, demux and parsing

I would not have merged it if it wasnt required for the "new" buffer API
but sadly it is.
Once the new API is in ill reimplement proper buffer reuse, which will
fix this speedloss. In case we choose not to merge the "new" buffer
API then this commit here should be reverted.

Conflicts:
libavcodec/internal.h
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: move ff_init_buffer_info() down to ff_get_buffer()
Michael Niedermayer [Wed, 5 Dec 2012 14:58:37 +0000 (15:58 +0100)]
lavc: move ff_init_buffer_info() down to ff_get_buffer()

and remove redundant code from ff_get_buffer()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'
Michael Niedermayer [Wed, 5 Dec 2012 14:52:16 +0000 (15:52 +0100)]
Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'
Michael Niedermayer [Wed, 5 Dec 2012 14:18:12 +0000 (15:18 +0100)]
Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'

* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
  lavc: add a wrapper for AVCodecContext.get_buffer().

Conflicts:
libavcodec/4xm.c
libavcodec/8svx.c
libavcodec/bmv.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/kmvc.c
libavcodec/mpc7.c
libavcodec/mpegaudiodec.c
libavcodec/pcx.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/rl2.c
libavcodec/snow.c
libavcodec/targa.c
libavcodec/tscc.c
libavcodec/txd.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vmdav.c
libavcodec/vp56.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoircamenc: 10l do not use avio_skip()
Paul B Mahol [Wed, 5 Dec 2012 13:46:35 +0000 (13:46 +0000)]
ircamenc: 10l do not use avio_skip()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoEnsoniq Paris Audio File demuxer
Paul B Mahol [Tue, 27 Nov 2012 15:14:53 +0000 (15:14 +0000)]
Ensoniq Paris Audio File demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoIRCAM demuxer & muxer
Paul B Mahol [Sun, 2 Dec 2012 18:13:56 +0000 (18:13 +0000)]
IRCAM demuxer & muxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agorsodec: use ff_pcm_read_packet()
Paul B Mahol [Mon, 3 Dec 2012 17:47:11 +0000 (17:47 +0000)]
rsodec: use ff_pcm_read_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosoxdec: use ff_pcm_read_packet()
Paul B Mahol [Mon, 3 Dec 2012 17:37:06 +0000 (17:37 +0000)]
soxdec: use ff_pcm_read_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoaudec: use ff_pcm_read_packet()
Paul B Mahol [Mon, 3 Dec 2012 17:30:02 +0000 (17:30 +0000)]
audec: use ff_pcm_read_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopvfdec: use ff_pcm_read_packet()
Paul B Mahol [Mon, 3 Dec 2012 17:27:28 +0000 (17:27 +0000)]
pvfdec: use ff_pcm_read_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavr: use ff_pcm_read_packet()
Paul B Mahol [Mon, 3 Dec 2012 17:26:16 +0000 (17:26 +0000)]
avr: use ff_pcm_read_packet()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopcmdec: move read_packet function to pcm.c so it can be shared with other demuxers
Paul B Mahol [Mon, 3 Dec 2012 17:22:21 +0000 (17:22 +0000)]
pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers

While here remove pts/dts code, it is apparently not needed and cause
problems for demuxers that will use such function.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoMerge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
Michael Niedermayer [Wed, 5 Dec 2012 12:25:23 +0000 (13:25 +0100)]
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: disable vf_gradfun test
Michael Niedermayer [Wed, 5 Dec 2012 12:10:24 +0000 (13:10 +0100)]
fate: disable vf_gradfun test

The non working test interferes with other peoples work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovc1dec: Fix null pointer dereference in vc1_decode_skip_blocks()
Michael Niedermayer [Wed, 5 Dec 2012 04:47:37 +0000 (05:47 +0100)]
vc1dec: Fix null pointer dereference in vc1_decode_skip_blocks()

This handles the last frame being unavailable like all the other
code in vc1dec.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc/dvdsubdec: accept palette from options.
Nicolas George [Sat, 1 Dec 2012 13:47:14 +0000 (14:47 +0100)]
lavc/dvdsubdec: accept palette from options.

On DVDs, the palette is part of the IFO file and therefore
not available when reading from a dumped VOB file.