]>
git.sesse.net Git - ffmpeg/log
Stefano Sabatini [Sat, 8 Dec 2012 21:47:52 +0000 (22:47 +0100)]
lavc/avcodec: extend/clarify/fix documentation for avcodec_fill_audio_frame()
Stefano Sabatini [Sun, 9 Dec 2012 19:39:27 +0000 (20:39 +0100)]
lavf/segment: remove silly assert(), improve feedback
The code should not assert in case of invalid user input. Fails
gracefully instead.
Michael Niedermayer [Sun, 9 Dec 2012 19:24:49 +0000 (20:24 +0100)]
http/utils: move mime -> demuxer maping from http to utils
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 18:49:51 +0000 (19:49 +0100)]
mpeg12: move current_picture_ptr reset to the end of decode_frame.
This fixes passing fields instead of frames into the decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 17:42:07 +0000 (18:42 +0100)]
probe: belive protocol content type if set and avoid lengthly probing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 17:41:23 +0000 (18:41 +0100)]
http: export ICY content type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 5 Jun 2012 14:34:01 +0000 (16:34 +0200)]
lavf: TED Talks JSON captions demuxer.
Carl Eugen Hoyos [Sun, 9 Dec 2012 17:24:56 +0000 (18:24 +0100)]
Improve x264opts description.
Peter Ross [Sun, 9 Dec 2012 11:42:54 +0000 (22:42 +1100)]
mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 16:14:15 +0000 (17:14 +0100)]
arm: put prefetch under matching #ifdef as the actual code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 13:08:01 +0000 (14:08 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avio: K&R cosmetic formatting
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 12:56:46 +0000 (13:56 +0100)]
Merge commit '
91ac403b1316d59b4f43c4ea0f237e24cec2819a '
* commit '
91ac403b1316d59b4f43c4ea0f237e24cec2819a ':
lavf: fix arithmetic overflows in avformat_seek_file()
mjpeg: initialize input padding after unescaped buffer to zero
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 12:35:49 +0000 (13:35 +0100)]
Merge commit '
18e6f087c4a50bede8449ee164778945480be50c '
* commit '
18e6f087c4a50bede8449ee164778945480be50c ':
img2: document the options available
hls: improve options description
hls: use a meaningful long name
hls: add start_number option
h264: check for invalid zeros_left before writing
Conflicts:
doc/demuxers.texi
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 04:23:06 +0000 (05:23 +0100)]
mxfdec: fix double free
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 9 Dec 2012 09:24:16 +0000 (10:24 +0100)]
Flip zerocodec output.
Fixes ticket #1218
Luca Barbato [Sun, 9 Dec 2012 03:15:45 +0000 (04:15 +0100)]
avio: K&R cosmetic formatting
Michael Niedermayer [Sun, 9 Dec 2012 04:04:05 +0000 (05:04 +0100)]
h264: avoid calling idr() twice
Fixes rare race condition leading to null pointer dereferences.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 9 Dec 2012 02:43:03 +0000 (03:43 +0100)]
lavc/libcelt: add missing internal.h include.
This should fix build (include is necessary for ff_get_buffer).
Paul B Mahol [Sun, 9 Dec 2012 01:45:25 +0000 (01:45 +0000)]
add forgotten AV_ prefix to some CODEC_IDs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Piotr Bandurski [Sat, 8 Dec 2012 21:36:57 +0000 (22:36 +0100)]
tiff: support zlib with invertedFillOrder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 8 Dec 2012 18:12:42 +0000 (19:12 +0100)]
lavu/opt: change the way ranges are printed
Ramiro Polla [Thu, 6 Dec 2012 04:32:47 +0000 (02:32 -0200)]
dshow: fix return code when opening device
Successfully opening a device altered the ret variable, making the function
not cleanup properly and return an incorrect value for errors that happened
afterwards.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Fri, 7 Dec 2012 13:53:56 +0000 (13:53 +0000)]
lavf: fix arithmetic overflows in avformat_seek_file()
The values compared here can be more than INT64_MAX apart. Since the
difference is always positive, converting to uint64_t before subtracting
gives the correct result without overflows.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Sat, 8 Dec 2012 17:41:06 +0000 (18:41 +0100)]
lavu/opt: make av_opt_query_ranges_default() return a meaningful error code
Piotr Bandurski [Sat, 8 Dec 2012 16:34:10 +0000 (17:34 +0100)]
mjpegdec: support more pix_fmt_ids for grayscale
samples created with
"cjpeg -grayscale -sample 1x3 / 1x4 / 3x1 / 3x3 / 4x1 / 4x3 / 4x4"
http://www.datafilehost.com/download-
d828329d .html
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 8 Dec 2012 17:34:38 +0000 (18:34 +0100)]
lavu/opt: perform misc cosmetical fixes
Stefano Sabatini [Sat, 8 Dec 2012 16:35:37 +0000 (17:35 +0100)]
lavfi/setfield: add support to named options and introspection
Michael Niedermayer [Fri, 7 Dec 2012 22:59:20 +0000 (23:59 +0100)]
sbr_hf_gen_sse: Optimize code a bit more.
Core I7 (Sandy Bridge) 135 to 107 cycles
Core i5 (Arrandale) 162 to 142 (Thanks to Christophe Gisquet for testing)
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Sat, 8 Dec 2012 15:50:44 +0000 (16:50 +0100)]
lavfi/setfield: switch to filter_frame API
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Matthieu Bouron [Thu, 6 Dec 2012 20:09:17 +0000 (21:09 +0100)]
lavfi/idet: switch to filter_frame API
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Janne Grunau [Sat, 8 Dec 2012 15:20:18 +0000 (16:20 +0100)]
mjpeg: initialize input padding after unescaped buffer to zero
Fixes valgrind --undef-value-errors=yes warnings caused by valid
overreads in the fate vsynth jpegls, cover-art-ape and cover-art-wv
tests.
Luca Barbato [Sat, 8 Dec 2012 04:49:37 +0000 (05:49 +0100)]
img2: document the options available
Luca Barbato [Sat, 8 Dec 2012 05:14:41 +0000 (06:14 +0100)]
hls: improve options description
Luca Barbato [Sat, 8 Dec 2012 05:00:46 +0000 (06:00 +0100)]
hls: use a meaningful long name
Luca Barbato [Sat, 8 Dec 2012 04:32:00 +0000 (05:32 +0100)]
hls: add start_number option
Ronald S. Bultje [Fri, 7 Dec 2012 21:09:20 +0000 (13:09 -0800)]
h264: check for invalid zeros_left before writing
Prevent an invalid write into coeffs[scantable[-1]] if zeros_left
itself was an invalid VLC code (and thus -1).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 8 Dec 2012 15:36:47 +0000 (16:36 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
golomb: use unsigned arithmetics in svq3_get_ue_golomb()
x86: float_dsp: fix loading of the len parameter on x86-32
takdec: fix initialisation of LOCAL_ALIGNED array
takdec: fix initialisation of LOCAL_ALIGNED array
Conflicts:
libavcodec/rv30.c
libavcodec/svq3.c
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 8 Dec 2012 13:57:38 +0000 (13:57 +0000)]
MAINTAINERS: add myself for my works
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Sat, 8 Dec 2012 15:02:54 +0000 (16:02 +0100)]
lavfi/version: remove unused dropped symbol
Michael Niedermayer [Sat, 8 Dec 2012 14:53:56 +0000 (15:53 +0100)]
Merge commit '
57231e4d5b467833fb289439cd35a92513bb55c1 '
* commit '
57231e4d5b467833fb289439cd35a92513bb55c1 ':
tak: demuxer, parser, and decoder
Not merged as requested by Author and Maintainer of tak in FFmpeg.
I just merged a few typo fixes and minor cosmetic improvments.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/takdec.c
libavcodec/version.h
libavformat/takdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 8 Dec 2012 11:08:38 +0000 (12:08 +0100)]
doc/filters: move volumedetect documentation below volume
Stefano Sabatini [Sat, 8 Dec 2012 11:07:03 +0000 (12:07 +0100)]
lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c
Justin's version has more features but is otherwise equivalent from the
point of view of the syntax.
Stefano Sabatini [Sat, 8 Dec 2012 14:38:20 +0000 (15:38 +0100)]
doc/filters: fix copy&paste error in volume_justin documentation
Spotted by ubitux.
Stefano Sabatini [Sat, 8 Dec 2012 10:58:52 +0000 (11:58 +0100)]
lavfi/volume_justin: add support to option shorthands and introspection
Stefano Sabatini [Sat, 8 Dec 2012 10:54:43 +0000 (11:54 +0100)]
lavfi/volume_justin: fix a few grammar inconsistencies in options description
Clément Bœsch [Sat, 8 Dec 2012 14:17:47 +0000 (15:17 +0100)]
doc: sync avoid_negative_ts option with internal help.
Michael Niedermayer [Sat, 8 Dec 2012 13:58:56 +0000 (14:58 +0100)]
Merge commit '
096abfa15052977eed93f0b5e01afd2d47c53c1f '
* commit '
096abfa15052977eed93f0b5e01afd2d47c53c1f ':
parser: fix large overreads
bitstream: add get_bits64() to support reading more than 32 bits at once
arm: detect cpu features at runtime on Linux
Conflicts:
libavcodec/parser.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:39:11 +0000 (14:39 +0100)]
get_bits: rename get_bits_longlong to get_bits64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:35:27 +0000 (14:35 +0100)]
mpegts: rename get_bits64 to get_ts64
Renaming because of name conflict
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:24:06 +0000 (14:24 +0100)]
Merge commit '
b326755989b346d0d935e0628e8865f9b2951c30 '
* commit '
b326755989b346d0d935e0628e8865f9b2951c30 ':
arm: rename ARMVFP config symbol to VFP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:19:55 +0000 (14:19 +0100)]
Merge commit '
637606de2d2e0af0a9fa2f23f943765d7d7c5cd5 '
* commit '
637606de2d2e0af0a9fa2f23f943765d7d7c5cd5 ':
configure: arm: make _inline arch ext symbols depend on inline_asm
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
Conflicts:
configure
libavcodec/arm/dca.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:13:53 +0000 (14:13 +0100)]
Merge commit '
7f2b3dcabd108926bde819ad574017f4161d1546 '
* commit '
7f2b3dcabd108926bde819ad574017f4161d1546 ':
configure: arm: check inline and external asm support for extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:08:41 +0000 (14:08 +0100)]
Merge commit '
c6ebc9faa2210d7f36a3036c357f6f199520f575 '
* commit '
c6ebc9faa2210d7f36a3036c357f6f199520f575 ':
configure: add check_insn function
configure: clean up check_inline_asm and check_as functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 13:04:34 +0000 (14:04 +0100)]
Merge commit '
f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea '
* commit '
f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea ':
configure: arm: set fast_clz and fast_unaligned in cpuflags section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 12:57:19 +0000 (13:57 +0100)]
Merge commit '
1234c66a315b139339d52ca193b3f1d67af9ce19 '
* commit '
1234c66a315b139339d52ca193b3f1d67af9ce19 ':
configure: arm: detect toolchain default arch version
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Dec 2012 12:49:26 +0000 (13:49 +0100)]
Merge commit '
9ebd45c2d58ad9241ad09718679f0cf7fb57da52 '
* commit '
9ebd45c2d58ad9241ad09718679f0cf7fb57da52 ':
configure: do not bypass cpuflags section if --cpu not given
dct-test: arm: indicate required cpu features for optimised funcs
snow: fix build after
594d4d5df3c70404168701dd5c90b7e6e5587793
arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
avpicture: Don't assume a valid pix fmt in avpicture_get_size
Conflicts:
libavcodec/avpicture.c
libavcodec/snow.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 8 Dec 2012 03:44:00 +0000 (04:44 +0100)]
lavf: improve avoid_negative_ts help text
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Fri, 30 Nov 2012 14:00:47 +0000 (15:00 +0100)]
golomb: use unsigned arithmetics in svq3_get_ue_golomb()
This prevents undefined behaviour of signed left shift if the coded
value is larger than 2^31. Large values are most likely invalid and
caused errors or by feeding random.
Validate every use of svq3_get_ue_golomb() and changed the place there
the return value was compared with negative numbers. dirac.c was clean,
fixed rv30 and svq3.
Stefano Sabatini [Sat, 8 Dec 2012 10:27:29 +0000 (11:27 +0100)]
lavfi/sendcmd: switch to filter_frame API
Stefano Sabatini [Sat, 8 Dec 2012 10:14:51 +0000 (11:14 +0100)]
lavfi/swapuv: switch to filter_frame API
Nicolas George [Wed, 28 Nov 2012 14:25:39 +0000 (15:25 +0100)]
lavc/mlpdec: reset layout when channels change.
Triggered by the sample for trac ticket #1726.
Justin Ruggles [Wed, 5 Dec 2012 17:51:34 +0000 (12:51 -0500)]
x86: float_dsp: fix loading of the len parameter on x86-32
Paul B Mahol [Wed, 5 Dec 2012 16:06:54 +0000 (16:06 +0000)]
gifdec: port to bytestream2 API
While here remove ff_lzw_cur_ptr() as it become obsolete.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 8 Dec 2012 00:24:07 +0000 (01:24 +0100)]
opt_list: fix vertical alignment of types
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Nov 2012 16:38:54 +0000 (17:38 +0100)]
opt: print ranges in opt_list()
The formating can and should be improved.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Nov 2012 16:10:09 +0000 (17:10 +0100)]
opt: Add support to query ranges
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Josh Allmann [Fri, 7 Dec 2012 23:00:30 +0000 (00:00 +0100)]
takdec: fix initialisation of LOCAL_ALIGNED array
When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Mans Rullgard [Fri, 7 Dec 2012 22:13:57 +0000 (22:13 +0000)]
takdec: fix initialisation of LOCAL_ALIGNED array
When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 7 Dec 2012 21:57:02 +0000 (22:57 +0100)]
lavc: check dimensions for video encoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 2 Oct 2012 13:43:19 +0000 (13:43 +0000)]
tak: demuxer, parser, and decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Wed, 3 Oct 2012 14:06:23 +0000 (16:06 +0200)]
parser: fix large overreads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Sun, 30 Sep 2012 00:39:55 +0000 (02:39 +0200)]
bitstream: add get_bits64() to support reading more than 32 bits at once
Also remove a duplicate function in the MPEG-TS demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Fri, 7 Dec 2012 20:48:27 +0000 (21:48 +0100)]
sws_scale: check input against NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 3 Sep 2012 00:51:00 +0000 (02:51 +0200)]
lavf: VobSub demuxer.
Stefano Sabatini [Fri, 7 Dec 2012 18:41:41 +0000 (19:41 +0100)]
lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()
Improve consistency/readability.
Stefano Sabatini [Fri, 7 Dec 2012 18:40:21 +0000 (19:40 +0100)]
lavfi/alphaextract: access outlink properties rather than out_buf->video
Avoid one dereference, simplify.
Stefano Sabatini [Fri, 7 Dec 2012 17:51:33 +0000 (18:51 +0100)]
lavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0
Fix crash, for example in the command:
ffmpeg -f image2 -vcodec pgmyuv -i tests/vsynth1/%02d.pgm \
-vf "[in]format=yuv420p,split,alphamerge,split[o3][o4];
[o4]vflip,alphaextract[alpha];[o3][alpha]alphamerge[out]" \
-vcodec rawvideo -f nut md5:
Stefano Sabatini [Fri, 7 Dec 2012 17:46:28 +0000 (18:46 +0100)]
lavfi/alphaextract: switch to filter_frame() API
Stefano Sabatini [Fri, 7 Dec 2012 17:36:58 +0000 (18:36 +0100)]
lavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()
The code causes uninitialized data copy, and may be actually slower than
a loop over each line in case the padding is big.
Paul B Mahol [Fri, 7 Dec 2012 17:52:23 +0000 (17:52 +0000)]
brstm: do not return partial packets
Such packets are useless.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Tue, 4 Dec 2012 23:29:34 +0000 (23:29 +0000)]
arm: rename ARMVFP config symbol to VFP
This is consistent with usual ARM nomenclature as well as with the
VFPV3 and NEON symbols which both lack the ARM prefix.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Wed, 5 Dec 2012 02:11:22 +0000 (02:11 +0000)]
arm: detect cpu features at runtime on Linux
This allows compiling optimised functions for features not enabled
in the core build and selecting these at runtime if the system has
the necessary support.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 3 Dec 2012 01:36:49 +0000 (01:36 +0000)]
configure: arm: make _inline arch ext symbols depend on inline_asm
This makes --disable-inline-asm work as expected.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 1 Dec 2012 15:19:10 +0000 (15:19 +0000)]
configure: arm: check inline and external asm support for extensions
This tests instruction set support in both inline and external asm.
If both fail, the base config option is disabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 1 Dec 2012 15:06:56 +0000 (15:06 +0000)]
configure: add check_insn function
The check_insn function tests an instruction in both inline asm and
standalone assembly, and sets _external/_inline config properties
accordingly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 3 Dec 2012 21:47:17 +0000 (21:47 +0000)]
configure: arm: set fast_clz and fast_unaligned in cpuflags section
These are properties of the targeted core and do not depend on
specific assembly support in the toolchain which if missing will
render the controlling options here disabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 30 Nov 2012 21:14:25 +0000 (21:14 +0000)]
configure: arm: detect toolchain default arch version
Probe for the toolchain default architecture version if no --cpu flag
is present or an unknown cpu is specified. Works with gcc, clang and
armcc.
This allows configuring based on the arch version even if it is not
explicitly specified to configure. It also causes an explicit -march
flag to be added to CFLAGS and ASFLAGS, which in turn lets us do
proper instruction set tests with the assembler.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 3 Dec 2012 19:21:42 +0000 (19:21 +0000)]
configure: do not bypass cpuflags section if --cpu not given
This will allow arch-specific ways of determining the target
variant when none is specified on the command line.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 1 Dec 2012 16:41:39 +0000 (16:41 +0000)]
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
These macros reflect the actual capabilities required here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 1 Dec 2012 13:19:05 +0000 (13:19 +0000)]
configure: clean up check_inline_asm and check_as functions
The check_inline_asm function should check the actual C compiler,
not the one used for assembly files. Usually these are the same,
but they might be different, typically when using a compiler other
than gcc.
The check_as should, as its name suggests, test the type of input
the AS command is used with, i.e. a standalond assembly (.S) file.
Finally, check for gnu assembler using the modified check_as as
this reflects actual usage.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 1 Dec 2012 23:08:41 +0000 (23:08 +0000)]
dct-test: arm: indicate required cpu features for optimised funcs
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Wed, 5 Dec 2012 05:34:02 +0000 (06:34 +0100)]
Michael Niedermayer [Fri, 7 Dec 2012 15:29:07 +0000 (16:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: add a pointer for weighted prediction temporary buffer
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 7 Dec 2012 15:17:15 +0000 (15:17 +0000)]
lavc/takdec: s/get_b/get_bits_esc4
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Fri, 7 Dec 2012 15:15:37 +0000 (16:15 +0100)]
avcodec: Fix a typo in an option description
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Paul B Mahol [Fri, 7 Dec 2012 14:56:22 +0000 (14:56 +0000)]
lavc/takdec: simplify code
Merge get_scale/get_shift into set_sample_rate_params().
Rename tak_set_bps to set_bps_params and remove 2nd argument.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 7 Dec 2012 14:45:25 +0000 (15:45 +0100)]
Merge commit '
d7d6efe42b0d2057e67999b96b9a391f533d2333 '
* commit '
d7d6efe42b0d2057e67999b96b9a391f533d2333 ':
h264: check sps.log2_max_frame_num for validity
mov: validate number of DataReferenceBox entries against box size
mov: compute avg_frame_rate only if duration is known
flac: change minimum and default of lpc_passes option to 1
Conflicts:
libavcodec/h264_ps.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Dec 2012 14:21:41 +0000 (15:21 +0100)]
Merge commit '
c25fc5c2bb6ae8c93541c9427df3e47206d95152 '
* commit '
c25fc5c2bb6ae8c93541c9427df3e47206d95152 ':
fate: dpcm: Add dependencies
SBR DSP x86: implement SSE sbr_hf_gen
AAC SBR: use AVFloatDSPContext's vector_fmul
fate: image: Add dependencies
Changelog: add an entry for deprecating the avconv -vol option
x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32
Conflicts:
Changelog
libavutil/x86/float_dsp.asm
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 6 Dec 2012 23:51:01 +0000 (23:51 +0000)]
arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
When initialising an FFTContext for a plain FFT, mdct_bits is not set
and can contain a garbage value. Since nbits is always valid and for
MDCT operation is mdct_bits - 2 checking this instead avoids using an
uninitialised value while having the same effect.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Paul B Mahol [Fri, 7 Dec 2012 13:05:43 +0000 (13:05 +0000)]
lavf/pcm: check size, do not produce invalid packets
Inspired by
92b8c9d89e7ae86bffa05393bb230d5a165b0148 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>