ffmpeg.git
5 years agosgienc: remove unused SgiContext
Paul B Mahol [Fri, 26 Jul 2013 18:21:44 +0000 (18:21 +0000)]
sgienc: remove unused SgiContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE
Paul B Mahol [Fri, 26 Jul 2013 17:16:26 +0000 (17:16 +0000)]
lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:24:55 +0000 (15:24 +0000)]
lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:20:13 +0000 (15:20 +0000)]
avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:11:17 +0000 (15:11 +0000)]
avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi/gradfun: remove nv21/nv12 as they are not supported
Paul B Mahol [Wed, 24 Jul 2013 17:09:14 +0000 (17:09 +0000)]
lavfi/gradfun: remove nv21/nv12 as they are not supported

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agopcxenc: get rid of unused PCXContext
Paul B Mahol [Fri, 26 Jul 2013 14:00:40 +0000 (14:00 +0000)]
pcxenc: get rid of unused PCXContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoyop: check return value of av_frame_alloc()
Paul B Mahol [Fri, 26 Jul 2013 13:51:26 +0000 (13:51 +0000)]
yop: check return value of av_frame_alloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agovmnc: check return values of reallocation
Paul B Mahol [Fri, 26 Jul 2013 13:49:36 +0000 (13:49 +0000)]
vmnc: check return values of reallocation

Also avoid memory leaks.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agovmnc: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 13:39:40 +0000 (13:39 +0000)]
vmnc: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi: add attribute_align_arg to all public entry points
Hendrik Leppkes [Fri, 26 Jul 2013 08:31:05 +0000 (10:31 +0200)]
lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/buffersrc: remove unused item from BufferSourceContext
Paul B Mahol [Fri, 26 Jul 2013 11:43:43 +0000 (11:43 +0000)]
lavfi/buffersrc: remove unused item from BufferSourceContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/dtsdec: Improve probe, reject things looking like analoge signals
Michael Niedermayer [Fri, 26 Jul 2013 02:09:30 +0000 (04:09 +0200)]
avformat/dtsdec: Improve probe, reject things looking like analoge signals

Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 26 Jul 2013 09:11:46 +0000 (11:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  miscellaneous typo fixes

Conflicts:
configure
libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
Michael Niedermayer [Fri, 26 Jul 2013 08:57:51 +0000 (10:57 +0200)]
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'

* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
  mpeg12: Ignore slice threading if hwaccel is active

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '582963a8156522582e55466be4a59974a8d909a5'
Michael Niedermayer [Fri, 26 Jul 2013 08:51:42 +0000 (10:51 +0200)]
Merge commit '582963a8156522582e55466be4a59974a8d909a5'

* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
Michael Niedermayer [Fri, 26 Jul 2013 08:43:12 +0000 (10:43 +0200)]
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'

* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
Michael Niedermayer [Fri, 26 Jul 2013 08:30:47 +0000 (10:30 +0200)]
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'

* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 25 Jul 2013 20:50:46 +0000 (22:50 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show max bitrate for mpeg2 video streams in avcodec_string().
  Allow native compilation on the iPhone.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too
Paul B Mahol [Thu, 25 Jul 2013 13:59:24 +0000 (13:59 +0000)]
lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/gxfenc: Added support for writing correct auxiliary data for DV streams.
Reuben Martin [Thu, 13 Jun 2013 04:17:21 +0000 (23:17 -0500)]
avformat/gxfenc: Added support for writing correct auxiliary data for DV streams.

Different aux data is written for DVCAM and DVPRO formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomiscellaneous typo fixes
Diego Biurrun [Sat, 4 May 2013 19:18:13 +0000 (21:18 +0200)]
miscellaneous typo fixes

5 years agompeg12: Ignore slice threading if hwaccel is active
Rémi Denis-Courmont [Wed, 24 Jul 2013 16:50:43 +0000 (19:50 +0300)]
mpeg12: Ignore slice threading if hwaccel is active

Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoShow max bitrate for mpeg2 video streams in avcodec_string().
Carl Eugen Hoyos [Thu, 25 Jul 2013 08:53:47 +0000 (10:53 +0200)]
Show max bitrate for mpeg2 video streams in avcodec_string().

See also 25b7aa9

5 years agoAllow native compilation on the iPhone.
Carl Eugen Hoyos [Thu, 25 Jul 2013 08:52:15 +0000 (10:52 +0200)]
Allow native compilation on the iPhone.

5 years agoavfilter/can_merge_formats: fix memleak
Michael Niedermayer [Thu, 25 Jul 2013 14:54:04 +0000 (16:54 +0200)]
avfilter/can_merge_formats: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avfiltergraph: fix check using the wrong variables
Michael Niedermayer [Thu, 25 Jul 2013 14:53:39 +0000 (16:53 +0200)]
avfilter/avfiltergraph: fix check using the wrong variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovdpau: Fix VC-1 interlaced mode
Rainer Hochecker [Wed, 24 Jul 2013 16:50:42 +0000 (19:50 +0300)]
vdpau: Fix VC-1 interlaced mode

VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agocosmetics: Add '0' to float constants ending in '.'.
Diego Biurrun [Tue, 23 Jul 2013 21:48:45 +0000 (23:48 +0200)]
cosmetics: Add '0' to float constants ending in '.'.

5 years agotwinvq: K&R formatting cosmetics
Diego Biurrun [Fri, 19 Jul 2013 22:06:29 +0000 (00:06 +0200)]
twinvq: K&R formatting cosmetics

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 25 Jul 2013 08:15:03 +0000 (10:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Comment out unused labels in simple_idct_arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_scale: use the inputs color range when its set and its not overridden
Michael Niedermayer [Wed, 24 Jul 2013 23:27:00 +0000 (01:27 +0200)]
avfilter/vf_scale: use the inputs color range when its set and its not overridden

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/sws_getColorspaceDetails: dont fail for non yuv
Michael Niedermayer [Thu, 25 Jul 2013 00:42:09 +0000 (02:42 +0200)]
swscale/sws_getColorspaceDetails: dont fail for non yuv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Support RGBA lpegs
Michael Niedermayer [Wed, 24 Jul 2013 22:32:44 +0000 (00:32 +0200)]
avcodec/mjpegdec: Support RGBA lpegs

Fixes Ticket896

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: exchange src & dst chroma pos
Michael Niedermayer [Wed, 24 Jul 2013 20:43:50 +0000 (22:43 +0200)]
swscale: exchange src & dst chroma pos

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: Comment out unused labels in simple_idct_arm
Martin Storsjö [Wed, 24 Jul 2013 09:22:55 +0000 (12:22 +0300)]
arm: Comment out unused labels in simple_idct_arm

When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:

ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)

Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agovf_scale: add input h/v_chr_pos parameters
Michael Niedermayer [Wed, 24 Jul 2013 16:33:58 +0000 (18:33 +0200)]
vf_scale: add input h/v_chr_pos parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_scale: add output h/v_chr_pos parameterss
Michael Niedermayer [Sun, 14 Jul 2013 03:03:06 +0000 (05:03 +0200)]
vf_scale: add output h/v_chr_pos parameterss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: partially rewrite and reformat libx264 docs
Timothy Gu [Mon, 22 Jul 2013 23:44:11 +0000 (16:44 -0700)]
doc/encoders: partially rewrite and reformat libx264 docs

Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agomatroskaenc: implement CueRelativePosition
Bernie Habermeier [Tue, 23 Jul 2013 07:52:08 +0000 (00:52 -0700)]
matroskaenc: implement CueRelativePosition

This is a minimal change to matroskaenc that implements CueRelativePosition in the output.
Most players will probably ignore this additional information, but it is in the
matroska spec, and it'd be nice to be able to make use of it.

Signed-off-by: Bernt Habermeier <bernt@wulfram.com>
Tested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: remove commented out assert
Michael Niedermayer [Wed, 24 Jul 2013 11:00:04 +0000 (13:00 +0200)]
avcodec/mpeg12dec: remove commented out assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodocumented that av_codec_close is required to call
Anshul Maheshwari [Wed, 24 Jul 2013 06:50:02 +0000 (12:20 +0530)]
documented that av_codec_close is required to call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalsdec: minor simplification in read_block()
Michael Niedermayer [Wed, 24 Jul 2013 10:36:52 +0000 (12:36 +0200)]
alsdec: minor simplification in read_block()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 24 Jul 2013 10:01:29 +0000 (12:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
Michael Niedermayer [Wed, 24 Jul 2013 09:41:39 +0000 (11:41 +0200)]
Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'

* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
libavcodec/8bps.c

See: 66ff90f4a3d81c25feaa672dc8cc9cc88017753d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'
Michael Niedermayer [Wed, 24 Jul 2013 09:09:26 +0000 (11:09 +0200)]
Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'

* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

See: db5b4875514eb7740844f514dbf236c9179a6a93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'
Michael Niedermayer [Wed, 24 Jul 2013 08:28:38 +0000 (10:28 +0200)]
Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
libavcodec/alsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
Michael Niedermayer [Wed, 24 Jul 2013 08:15:50 +0000 (10:15 +0200)]
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: support reading compressed data
Zhang Rui [Mon, 22 Jul 2013 20:07:10 +0000 (04:07 +0800)]
avformat/http: support reading compressed data

Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Warn the user about the lack of a lock manager if insufficient locks...
Michael Niedermayer [Tue, 23 Jul 2013 23:04:24 +0000 (01:04 +0200)]
avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected

A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years ago8bps: Make the bound-checks consistent
Luca Barbato [Tue, 23 Jul 2013 12:19:09 +0000 (14:19 +0200)]
8bps: Make the bound-checks consistent

5 years ago8bps: Bound-check the input buffer
Luca Barbato [Mon, 22 Jul 2013 21:26:05 +0000 (23:26 +0200)]
8bps: Bound-check the input buffer

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years ago4xm: Reject not a multiple of 16 dimension
Luca Barbato [Mon, 22 Jul 2013 10:44:19 +0000 (12:44 +0200)]
4xm: Reject not a multiple of 16 dimension

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoalsdec: Clean up error paths
Luca Barbato [Fri, 12 Jul 2013 21:38:02 +0000 (23:38 +0200)]
alsdec: Clean up error paths

Fix at least a memory leak.

CC: libav-stable@libav.org
5 years agoalsdec: Fix the clipping range
Luca Barbato [Fri, 12 Jul 2013 21:02:25 +0000 (23:02 +0200)]
alsdec: Fix the clipping range

mcc_weightings is only 32 elements.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoavcodec/utils: use av_assert0() to check validity of input pointers for start code...
Michael Niedermayer [Tue, 23 Jul 2013 19:23:09 +0000 (21:23 +0200)]
avcodec/utils: use av_assert0() to check validity of input pointers for start code search

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avfiltergraph: minor cosmetic
Michael Niedermayer [Tue, 23 Jul 2013 18:58:21 +0000 (20:58 +0200)]
avfilter/avfiltergraph: minor cosmetic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Dont partially merge lists
Michael Niedermayer [Mon, 22 Jul 2013 00:31:04 +0000 (02:31 +0200)]
avfilter: Dont partially merge lists

This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf/ffio_init_context: set seekable automatically
Hendrik Schreiber [Tue, 23 Jul 2013 09:25:34 +0000 (11:25 +0200)]
avformat/aviobuf/ffio_init_context: set seekable automatically

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 23 Jul 2013 08:30:22 +0000 (10:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Mangle external symbols properly in new vfp assembly files

See: 47d57f24e35f0e9694c615b81511dde4cda95c72
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: add avcodec_chroma_pos_to_enum()
Michael Niedermayer [Wed, 17 Jul 2013 20:41:39 +0000 (22:41 +0200)]
avcodec: add avcodec_chroma_pos_to_enum()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: add avcodec_enum_to_chroma_pos()
Michael Niedermayer [Wed, 17 Jul 2013 20:30:54 +0000 (22:30 +0200)]
avcodec: add avcodec_enum_to_chroma_pos()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder
clook [Sun, 14 Jul 2013 04:14:56 +0000 (04:14 +0000)]
avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder

5 years agolibswscale: Adding RGB => XYZ support
clook [Sun, 14 Jul 2013 03:30:38 +0000 (03:30 +0000)]
libswscale: Adding RGB => XYZ support

5 years agoavformat/hls: avoid floating point arithmetic
Michael Niedermayer [Mon, 22 Jul 2013 17:36:33 +0000 (19:36 +0200)]
avformat/hls: avoid floating point arithmetic

Should make things more reproducable across platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hls: parse EXTINF duration as floating-point number
Zhang Rui [Mon, 22 Jul 2013 13:21:38 +0000 (21:21 +0800)]
avformat/hls: parse EXTINF duration as floating-point number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: Mangle external symbols properly in new vfp assembly files
Martin Storsjö [Mon, 22 Jul 2013 09:24:43 +0000 (12:24 +0300)]
arm: Mangle external symbols properly in new vfp assembly files

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Mangle external symbols properly in new vfp assembly files
Martin Storsjö [Mon, 22 Jul 2013 09:33:22 +0000 (12:33 +0300)]
arm: Mangle external symbols properly in new vfp assembly files

Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 22 Jul 2013 10:11:18 +0000 (12:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add VFP-accelerated version of qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'
Michael Niedermayer [Mon, 22 Jul 2013 10:10:53 +0000 (12:10 +0200)]
Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'

* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
  dcadsp: Add a new method, qmf_32_subbands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'
Michael Niedermayer [Mon, 22 Jul 2013 10:05:16 +0000 (12:05 +0200)]
Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'

* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
  arm: Add VFP-accelerated version of fft16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac'
Michael Niedermayer [Mon, 22 Jul 2013 10:03:45 +0000 (12:03 +0200)]
Merge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac'

* commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac':
  arm: Add VFP-accelerated version of dca_lfe_fir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'
Michael Niedermayer [Mon, 22 Jul 2013 09:56:04 +0000 (11:56 +0200)]
Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'

* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
  arm: Add VFP-accelerated version of imdct_half

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'
Michael Niedermayer [Mon, 22 Jul 2013 09:55:20 +0000 (11:55 +0200)]
Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'

* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
  arm: Add VFP-accelerated version of int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587'
Michael Niedermayer [Mon, 22 Jul 2013 09:48:29 +0000 (11:48 +0200)]
Merge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587'

* commit '26ffcc7de1d98f77400a2ebe4e75055515c54587':
  dcadec: Use int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2'
Michael Niedermayer [Mon, 22 Jul 2013 09:47:49 +0000 (11:47 +0200)]
Merge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2'

* commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2':
  fmtconvert: Add a new method, int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'
Michael Niedermayer [Mon, 22 Jul 2013 09:42:11 +0000 (11:42 +0200)]
Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'

* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
  arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'
Michael Niedermayer [Mon, 22 Jul 2013 09:40:21 +0000 (11:40 +0200)]
Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'

* commit '41ef1d360bac65032aa32f6b43ae137666507ae5':
  arm: Add VFP-accelerated version of synth_filter_float

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8000206abcc82491c2a8c71e494c5477ede7264c'
Michael Niedermayer [Mon, 22 Jul 2013 08:53:54 +0000 (10:53 +0200)]
Merge commit '8000206abcc82491c2a8c71e494c5477ede7264c'

* commit '8000206abcc82491c2a8c71e494c5477ede7264c':
  libspeexdec: fix detection of final terminator code

See: f3c9d66bafde9b8586bd63dd3307daa87352af75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1'
Michael Niedermayer [Mon, 22 Jul 2013 08:31:43 +0000 (10:31 +0200)]
Merge commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1'

* commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1':
  configure: generate full msvc debug symbols when linking in debug mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'
Michael Niedermayer [Mon, 22 Jul 2013 08:20:05 +0000 (10:20 +0200)]
Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'

* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
  libx264: Define X264_API_IMPORTS on MSVC/ICL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: Add VFP-accelerated version of qmf_32_subbands
Ben Avison [Mon, 15 Jul 2013 17:28:17 +0000 (18:28 +0100)]
arm: Add VFP-accelerated version of qmf_32_subbands

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1323.0  98.0      746.2  60.6   +77.3%
Overall        15400.0 336.4    14147.5 288.4    +8.9%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodcadsp: Add a new method, qmf_32_subbands
Ben Avison [Mon, 15 Jul 2013 17:28:16 +0000 (18:28 +0100)]
dcadsp: Add a new method, qmf_32_subbands

This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add VFP-accelerated version of fft16
Martin Storsjö [Fri, 19 Jul 2013 08:23:57 +0000 (11:23 +0300)]
arm: Add VFP-accelerated version of fft16

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1389.3  4.2       967.8  35.1   +43.6%
Overall        15577.5 83.2     15400.0 336.4    +1.2%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add VFP-accelerated version of dca_lfe_fir
Martin Storsjö [Fri, 19 Jul 2013 08:03:32 +0000 (11:03 +0300)]
arm: Add VFP-accelerated version of dca_lfe_fir

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function    868.2  33.5      436.0  27.0   +99.1%
Overall        15973.0 223.2    15577.5  83.2    +2.5%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add VFP-accelerated version of imdct_half
Martin Storsjö [Fri, 19 Jul 2013 07:59:17 +0000 (10:59 +0300)]
arm: Add VFP-accelerated version of imdct_half

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   2653.0  28.5     1108.8  51.4   +139.3%
Overall        17049.5 408.2    15973.0 223.2     +6.7%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add VFP-accelerated version of int32_to_float_fmul_array8
Ben Avison [Mon, 15 Jul 2013 17:28:12 +0000 (18:28 +0100)]
arm: Add VFP-accelerated version of int32_to_float_fmul_array8

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function    366.2  18.3      277.8  13.7   +31.9%
Overall        18420.5 489.1    17049.5 408.2    +8.0%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodcadec: Use int32_to_float_fmul_array8
Ben Avison [Tue, 16 Jul 2013 12:41:18 +0000 (15:41 +0300)]
dcadec: Use int32_to_float_fmul_array8

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agofmtconvert: Add a new method, int32_to_float_fmul_array8
Ben Avison [Mon, 15 Jul 2013 17:28:11 +0000 (18:28 +0100)]
fmtconvert: Add a new method, int32_to_float_fmul_array8

This is similar to int32_to_float_fmul_scalar, but
loads a new scalar multiplier every 8 input samples.
This enables the use of much larger input arrays, which
is important for pipelining on some CPUs (such as
ARMv6).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add VFP-accelerated version of int32_to_float_fmul_scalar
Ben Avison [Mon, 15 Jul 2013 17:28:10 +0000 (18:28 +0100)]
arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1175.0   4.4      366.2  18.3   +220.8%
Overall        19285.5 292.0    18420.5 489.1     +4.7%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add VFP-accelerated version of synth_filter_float
Ben Avison [Mon, 15 Jul 2013 17:28:09 +0000 (18:28 +0100)]
arm: Add VFP-accelerated version of synth_filter_float

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   9295.0 114.9     4853.2 83.5    +91.5%
Overall        23699.8 397.6    19285.5 292.0   +22.9%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc: add "rematrix_maxval"
Michael Niedermayer [Mon, 22 Jul 2013 01:37:55 +0000 (03:37 +0200)]
doc: add "rematrix_maxval"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample: fix negative rematrix volumns
Michael Niedermayer [Mon, 22 Jul 2013 01:24:22 +0000 (03:24 +0200)]
swresample: fix negative rematrix volumns

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample: Make rematrix maxvalue user settable
Michael Niedermayer [Mon, 22 Jul 2013 01:23:54 +0000 (03:23 +0200)]
swresample: Make rematrix maxvalue user settable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/REDUCE_FORMATS: fix bug that ended reducing too early
Michael Niedermayer [Sun, 21 Jul 2013 23:55:48 +0000 (01:55 +0200)]
avfilter/REDUCE_FORMATS: fix bug that ended reducing too early

Prior to this it was possible that format reduction was ended
before it fully propagated leading to failure later in picking
formats.
No testcase with unmodified source exists, the case was reproduced
with less aggressive list merging though.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_sei: Try to make code more robust by jumping to the specified SEI ends
Michael Niedermayer [Sun, 21 Jul 2013 17:34:28 +0000 (19:34 +0200)]
avcodec/h264_sei: Try to make code more robust by jumping to the specified SEI ends

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibspeexdec: fix detection of final terminator code
Justin Ruggles [Sat, 13 Jul 2013 15:55:33 +0000 (11:55 -0400)]
libspeexdec: fix detection of final terminator code

5 years agoffplay: improve error message in case of failure, mention filtergraph configuration
Stefano Sabatini [Sat, 20 Jul 2013 17:04:22 +0000 (19:04 +0200)]
ffplay: improve error message in case of failure, mention filtergraph configuration

5 years agoconfigure: generate full msvc debug symbols when linking in debug mode
Hendrik Leppkes [Fri, 19 Jul 2013 13:44:39 +0000 (15:44 +0200)]
configure: generate full msvc debug symbols when linking in debug mode

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 21 Jul 2013 16:03:21 +0000 (18:03 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix build with disabled avfilter

Merged-by: Michael Niedermayer <michaelni@gmx.at>