OSDN Git Service
Clément Bœsch [Tue, 11 Dec 2012 02:57:33 +0000 (03:57 +0100)]
doc: fix a -map syntax in one command line example.
Clément Bœsch [Tue, 11 Dec 2012 01:52:55 +0000 (02:52 +0100)]
build: fix prores decoder dependencies.
According to lavc/proresdsp.c, both prores and prores-lgpl decoders need
lavc/x86/proresdsp_init.c:ff_proresdsp_x86_init().
Clément Bœsch [Tue, 11 Dec 2012 01:13:43 +0000 (02:13 +0100)]
doxy: add ref for lavfi, lpp and lsws.
Michael Niedermayer [Tue, 11 Dec 2012 00:53:01 +0000 (01:53 +0100)]
doxy: fix swr group name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 11 Dec 2012 00:26:32 +0000 (01:26 +0100)]
Print bpc (for bits per component) with pixel format if it is smaller than expected.
Stefano Sabatini [Thu, 29 Nov 2012 12:45:50 +0000 (13:45 +0100)]
lavf/segment: add reset_timestamps option
The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.
It is meant to address trac ticket #1425.
Michael Niedermayer [Mon, 10 Dec 2012 23:00:54 +0000 (00:00 +0100)]
opt: fix memleak on error of range_array
Fixes CID747739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 22:58:26 +0000 (23:58 +0100)]
http: dont null check p, its unneeded
Fixes CID747740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 22:55:21 +0000 (23:55 +0100)]
vf_tinterlace: default of mode switch is impossible, add assert.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 21:48:29 +0000 (22:48 +0100)]
libavcodec/x86/mpegvideo: switch to av_assert2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 22:20:47 +0000 (23:20 +0100)]
itu H.263: Fix handling of PB blocks
This fixes artifacts in Ticket744
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 19:51:32 +0000 (20:51 +0100)]
h264: dont try to allocate scratchpad if linesize is not known
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 16:20:32 +0000 (17:20 +0100)]
swfdec: check lens validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 10 Dec 2012 13:59:15 +0000 (13:59 +0000)]
build: update mxf muxer dependencies
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 10 Dec 2012 13:48:06 +0000 (13:48 +0000)]
lavc: fix typo and avrn build dependencies
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 10 Dec 2012 13:32:23 +0000 (14:32 +0100)]
dsputil_mmx: switch to av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 10 Dec 2012 12:04:02 +0000 (12:04 +0000)]
takdec: silence/fix warning for undefined behavior
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 10 Dec 2012 11:45:11 +0000 (12:45 +0100)]
mips: disable ac3 downmix, until its updated to the new data layout.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 11:12:42 +0000 (12:12 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Remove an outdated todo comment
rtpdec: Rename a static variable to normal naming conventions
sh4: dsputil: remove duplicate of ff_gmc_c()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 8 Dec 2012 06:34:11 +0000 (17:34 +1100)]
mov: parse @PRM and @PRQ metadata tags
These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.
Peter Ross [Mon, 10 Dec 2012 10:02:51 +0000 (21:02 +1100)]
codec_desc: AV_CODEC_ID_SMPTE_KLV is data
Martin Storsjö [Sun, 9 Dec 2012 19:00:12 +0000 (21:00 +0200)]
rtpdec: Remove an outdated todo comment
This comment was added in
e309128f, in 2002, and has been brought
along since then more or less unmodified.
The first point of the todo was implemented in
dbf30963 in 2006,
the second one is not relevant to rtpdec.c (brought along from
rtp.c in
8eb793c4 in 2008) but would be more relevant to the
rtp muxer, although it isn't a good idea anyway.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 9 Dec 2012 18:45:27 +0000 (20:45 +0200)]
rtpdec: Rename a static variable to normal naming conventions
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Sun, 9 Dec 2012 20:39:42 +0000 (20:39 +0000)]
sh4: dsputil: remove duplicate of ff_gmc_c()
This function is an exact duplicate of the generic one.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Mon, 10 Dec 2012 02:11:16 +0000 (03:11 +0100)]
ac3dec: fix bugs in direct buffer use.
This fixes potentially exploitable out of array writes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 01:13:26 +0000 (02:13 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove unused macro WRAPPER8_16
configure: fix automatic processing of _extralibs in check_deps
libvpxenc: Support forcing keyframes
ac3dec: decode directly into output buffers
Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 01:06:50 +0000 (02:06 +0100)]
Merge commit '
30b39164256999efc8d77edc85e2e0b963c24834'
* commit '
30b39164256999efc8d77edc85e2e0b963c24834':
ac3dec: make downmix() take array of pointers to channel data
Conflicts:
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 00:32:37 +0000 (01:32 +0100)]
Merge commit '
b8f3ab8e6a7ce3627764da53b809628c828d4047'
* commit '
b8f3ab8e6a7ce3627764da53b809628c828d4047':
ac3dec: output planar float only
svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
configure: Have protocols select network code instead of depending on it
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Dec 2012 00:27:10 +0000 (01:27 +0100)]
Merge commit '
5d471b73d20616f5ac701ff62e5de49465cda264'
* commit '
5d471b73d20616f5ac701ff62e5de49465cda264':
rtpdec: K&R formatting and spelling cosmetics
cosmetics: Fix dropable --> droppable typo
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 9 Dec 2012 17:34:14 +0000 (17:34 +0000)]
configure: fix automatic processing of _extralibs in check_deps
This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Mon, 10 Dec 2012 00:00:16 +0000 (01:00 +0100)]
http/utils: rename "demuxer" to mime_type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Dec 2012 22:34:32 +0000 (23:34 +0100)]
ffserver: set oformat
Fix Ticket1986
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 9 Dec 2012 13:28:44 +0000 (13:28 +0000)]
dsputil: remove unused macro WRAPPER8_16
This macro has never been used.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Paul B Mahol [Sat, 8 Dec 2012 12:18:23 +0000 (12:18 +0000)]
tak: reduce difference with qatar
Mostly cosmetics changes, but also makes
decoding little faster here.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Sun, 9 Dec 2012 17:34:14 +0000 (17:34 +0000)]
configure: fix automatic processing of _extralibs in check_deps
This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.
Signed-off-by: Mans Rullgard <mans@mansr.com>
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>
Martin Storsjö [Wed, 5 Dec 2012 15:17:20 +0000 (17:17 +0200)]
libvpxenc: Support forcing keyframes
Signed-off-by: Martin Storsjö <martin@martin.st>
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>
Mans Rullgard [Thu, 13 Sep 2012 18:35:18 +0000 (19:35 +0100)]
ac3dec: make downmix() take array of pointers to channel data
Mans Rullgard [Tue, 11 Sep 2012 16:25:05 +0000 (17:25 +0100)]
ac3dec: output planar float only
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 13 Sep 2012 18:40:03 +0000 (19:40 +0100)]
ac3dec: decode directly into output buffers
Signed-off-by: Mans Rullgard <mans@mansr.com>
Janne Grunau [Sat, 8 Dec 2012 12:36:28 +0000 (13:36 +0100)]
svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
Diego Biurrun [Fri, 7 Dec 2012 14:03:40 +0000 (15:03 +0100)]
configure: Have protocols select network code instead of depending on it
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>
Martin Storsjö [Fri, 7 Dec 2012 13:50:17 +0000 (15:50 +0200)]
rtpdec: K&R formatting and spelling cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Fri, 7 Dec 2012 09:25:27 +0000 (10:25 +0100)]
cosmetics: Fix dropable --> droppable typo
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>