]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Justin Ruggles [Sat, 13 Jul 2013 15:55:33 +0000 (11:55 -0400)]
libspeexdec: fix detection of final terminator code
Stefano Sabatini [Sat, 20 Jul 2013 17:04:22 +0000 (19:04 +0200)]
ffplay: improve error message in case of failure, mention filtergraph configuration
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>
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>
Michael Niedermayer [Sun, 21 Jul 2013 14:39:18 +0000 (16:39 +0200)]
avcodec/ff_h264_decode_sei: use skip_bits_long()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 14:38:47 +0000 (16:38 +0200)]
avcodec/ff_h264_decode_sei: Check SEI size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 14:34:14 +0000 (16:34 +0200)]
avcodec/ff_h264_decode_sei: fix integer overflow with size.
This issue is hypothetical and no testcase is available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 14:15:24 +0000 (16:15 +0200)]
avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 15:51:25 +0000 (17:51 +0200)]
Revert "avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716"
This causes a race condition with VLC. Its plausible that other
applications also would have races with it and its just fixing a memleak when
the user application forgets to free the codec. It causes more
problems than it solves in its current form, thus the revert.
Better solutions are welcome
This reverts commit
0f229f9b91fe3c4ebd97e88f004d638819b76add .
Joakim Plate [Thu, 27 Jun 2013 21:09:06 +0000 (23:09 +0200)]
h264: add frame packing as stereo_mode frame metadata
This matches the matroska defintion of stereo_mode, with
no metadata written if no info exist in sei
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Thu, 27 Jun 2013 10:09:19 +0000 (15:39 +0530)]
avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Fri, 19 Jul 2013 18:25:57 +0000 (14:25 -0400)]
libx264: Define X264_API_IMPORTS on MSVC/ICL
libx264 has a few data exports which require X264_API_IMPORTS
to be defined if we link to libx264 dynamically on Windows.
In a similar fashion to how we handle our compat snprintf
implementation, if we define it all the time, the compiler
will first try and link to __imp_x264_symbol_name, and failing
that, as in the case of a static libx264, will attempt to link
to the non-prefixed symbol, which has already been pulled in by
other x264 functions' object files.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sun, 21 Jul 2013 10:07:35 +0000 (12:07 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsicinav: Clip the source size to the expected maximum
Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 21 Jul 2013 09:55:49 +0000 (11:55 +0200)]
ffplay: fix build with disabled avfilter
Got broken in
b383498e .
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sun, 21 Jul 2013 09:55:51 +0000 (11:55 +0200)]
Merge commit '
dd0bfc3a6a310e3e3674ce7742672d689a9a0e93 '
* commit '
dd0bfc3a6a310e3e3674ce7742672d689a9a0e93 ':
dsicinav: Bound-check the source buffer when needed
Conflicts:
libavcodec/dsicinav.c
See:
47f0beadba9003391d8bfef59b15aa21a5b2d293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 09:45:48 +0000 (11:45 +0200)]
Merge commit '
fcae3ff124ee97c9265e3b93f3d41238b2aee9bd '
* commit '
fcae3ff124ee97c9265e3b93f3d41238b2aee9bd ':
dsicinav: K&R formatting cosmetics
Conflicts:
libavcodec/dsicinav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 02:47:09 +0000 (04:47 +0200)]
vfilter/vf_scale: avoid using "{}"
Should fix compile issues with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 02:40:12 +0000 (04:40 +0200)]
avcodec/snowenc: convert speed relevant asserts to av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Jul 2013 02:36:32 +0000 (04:36 +0200)]
avcodec/snowdec: remove assert.h include, its unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 22:58:40 +0000 (00:58 +0200)]
jpeg2000dec: Support non subsampled 9-16bit planar pixel formats
This applies changes similar to
fc6de70c44be05eb0368ab519bfb790431d8dee5
to the >8bit codepath
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Jul 2013 21:24:13 +0000 (23:24 +0200)]
doc/filters: document vf_scales color range
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Jul 2013 20:20:25 +0000 (22:20 +0200)]
avfilter/vf_scale; fix indent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Jul 2013 20:12:42 +0000 (22:12 +0200)]
avfilter/vf_scale: add in/out color range option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Jul 2013 20:11:50 +0000 (22:11 +0200)]
avfilter/vf_scale: Add in/out yuv color matrix option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Fri, 19 Jul 2013 13:32:25 +0000 (15:32 +0200)]
lavu/log: print prefix after \r.
Should fix trac ticket #2797 because of the progress line.
Michael Niedermayer [Sat, 20 Jul 2013 08:48:15 +0000 (10:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: filtfmts: use newer avfilter APIs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Jul 2013 08:37:25 +0000 (10:37 +0200)]
Merge commit '
36fb0d02a1faa11eaee51de01fb4061ad6092af9 '
* commit '
36fb0d02a1faa11eaee51de01fb4061ad6092af9 ':
rtsp: Support multicast source filters (RFC 4570)
rtpproto: Check the source IP if one single source has been specified
rtpproto: Support IGMPv3 source specific multicast inclusion
Conflicts:
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 13 Jul 2013 11:55:43 +0000 (13:55 +0200)]
ffplay: use start_time as next audio pts on flush when seeking is not supported
Theoretically using start_time should also work if seeking is available and we
could determine that the next packet after a flush packet is the first packet
of a stream, but I could not think of an easy and clean way to do that, that is
why I sticked to the no seeking available condition for now.
Fixes ticket #2647.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 13 Jul 2013 00:50:24 +0000 (02:50 +0200)]
ffplay: estimate audio frame pts from the previous frame pts values
Previously we estimated the audio packet pts instead of the frame pts,
therefore it only worked within a single packet (containing multiple frames).
The new method works accross seperate audio packets as well and also handles
better the case if a decoder buffers several packets before outputting a
decoded frame.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 2 Jul 2013 23:58:15 +0000 (01:58 +0200)]
ffplay: simplify audio decoding
Also use negative stream_index for signaling obsolete audio packets. Using the
size alone is not enough, because size is 0 for null packets as well.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Fri, 19 Jul 2013 22:44:09 +0000 (00:44 +0200)]
avfilter/vf_separatefields: fix ;;
Found-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 20:52:16 +0000 (22:52 +0200)]
avformat/matroskaenc: Only change chapter ids if needed.
This also fixes the case where negative chapter ids where input
And fixes the case where remuxing from mkv changed chapter ids
Found-by: Luca Barbato
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Fri, 19 Jul 2013 19:34:21 +0000 (21:34 +0200)]
dsicinav: Clip the source size to the expected maximum
A packet larger than cin->bitmap_size does not make sense.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 19 Jul 2013 19:09:40 +0000 (21:09 +0200)]
dsicinav: Bound-check the source buffer when needed
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 19 Jul 2013 19:05:44 +0000 (21:05 +0200)]
dsicinav: K&R formatting cosmetics
wm4 [Fri, 19 Jul 2013 17:05:41 +0000 (19:05 +0200)]
avfilter: fix preprocessor condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Wed, 17 Jul 2013 23:34:43 +0000 (01:34 +0200)]
doc/filters: add sepia example for colorchannelmixer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 19 Jul 2013 16:56:33 +0000 (18:56 +0200)]
avutil/softfloat: remove unneeded include assert.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 16:55:28 +0000 (18:55 +0200)]
tests/tiny_psnr: remove unneeded include assert.h
This is the only such occurance on tests/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 16:53:37 +0000 (18:53 +0200)]
avfilter/vf_yadif:remove unneeded include assert.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 16:52:41 +0000 (18:52 +0200)]
swscale: remove unneeded include assert.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 15:54:57 +0000 (17:54 +0200)]
jpeg2000dec: silence unused variable warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Thu, 18 Jul 2013 07:36:05 +0000 (09:36 +0200)]
bmp: fix decoding of flipped rle4
Fixes ticket #2794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 02:19:23 +0000 (04:19 +0200)]
swscale/input: fix 16bit gbrp input
Fixes Ticket2793
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Thu, 18 Jul 2013 13:45:37 +0000 (15:45 +0200)]
examples: demuxing: print ffplay command even if sample format is planar
Adjust the code so that a working ffplay command is printed in the
planar audio case.
wm4 [Thu, 18 Jul 2013 13:45:36 +0000 (15:45 +0200)]
examples: demuxing: simplify audio output
There is no reason why this should copy the audio data in a very
complicated way. Also, strictly write the first plane, instead of
writing the whole buffer. This is more helpful in context of the
example. This way a user can clearly confirm that it works by playing
the written data as raw audio.
wm4 [Thu, 18 Jul 2013 13:45:35 +0000 (15:45 +0200)]
examples: demuxing: do partial audio packet decoding
This assumes one audio packet is decoded one time. This is not true:
packets can be partially decoded. Then you have to "adjust" the packet
and pass the undecoded part of the packet to the decode function again.
Vittorio Giovara [Tue, 16 Jul 2013 13:05:01 +0000 (15:05 +0200)]
lavfi: filtfmts: use newer avfilter APIs
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 19 Jul 2013 09:08:38 +0000 (11:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: Add missing license boilerplates
Conflicts:
compat/tms470/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ed Torbett [Thu, 27 Jun 2013 07:53:00 +0000 (08:53 +0100)]
rtsp: Support multicast source filters (RFC 4570)
This supports inclusion of one single IP address for now,
at the media level. Specifying the filter at the session level
(instead of at the media level), multiple source addresses,
exclusion, or using FQDNs instead of plain IP addresses is not
supported (yet at least).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 18 Jul 2013 18:12:14 +0000 (21:12 +0300)]
rtpproto: Check the source IP if one single source has been specified
If another peer is sending unicast packets to the same port that
we are listening on, those packets can end up being received despite
using source specific multicast. For those cases, manually check the
source address of received packets against the intended source address.
This only handles the case when the source list is one single IP
address for now, which probably is the most common case.
Based on a patch by Ed Torbett.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ed Torbett [Thu, 18 Jul 2013 17:04:16 +0000 (20:04 +0300)]
rtpproto: Support IGMPv3 source specific multicast inclusion
Blocking/exclusion is not supported yet.
The rtp protocol parameter takes the same form as the existing
sources parameter for the udp protocol.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 19 Jul 2013 08:56:10 +0000 (10:56 +0200)]
Merge commit '
439902e0d68a0f0d800c21b5e6b598d5fa0c51da '
* commit '
439902e0d68a0f0d800c21b5e6b598d5fa0c51da ':
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Conflicts:
compat/aix/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Jul 2013 08:25:26 +0000 (10:25 +0200)]
Merge commit '
d010e95f86089abe9a3d4d4a66ac8102312d28a4 '
* commit '
d010e95f86089abe9a3d4d4a66ac8102312d28a4 ':
avserver: Remove unused loadable module support
Conflicts:
configure
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ramiro Polla [Thu, 18 Jul 2013 22:17:11 +0000 (19:17 -0300)]
img2enc: add option to use strftime() for filename
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 22:58:40 +0000 (00:58 +0200)]
jpeg2000dec: Support non subsampled 8bit planar pixel formats
Fixes file2.jp2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 22:57:32 +0000 (00:57 +0200)]
jpeg2000dec: parse CDEF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:
libavcodec/jpeg2000dec.c
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 18 Jul 2013 13:13:18 +0000 (15:13 +0200)]
compat: Add missing license boilerplates
Diego Biurrun [Thu, 25 Oct 2012 14:49:26 +0000 (16:49 +0200)]
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Also fix a comment and an #endif comment.
Michael Niedermayer [Thu, 18 Jul 2013 16:10:41 +0000 (18:10 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix pix_fmt detection in the native jpeg2000 decoder.
lavf/concat: Never fail for sample aspect ratio 0:1.
lut3d: Fix reading 3dl files with leading comments.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ed Torbett [Thu, 27 Jun 2013 07:53:00 +0000 (08:53 +0100)]
avformat/rt*p: Joining a SSM multicast group using an SDP (Issue #2171)
Passes Source-Specific Multicast parameters read from an sdp file through to the UDP socket code,
allowing source-specific multicast streams to be correctly received. As an integral part of this
change, additional checking (currently only enabled in the case of SSM streams, but probably
useful in similar scenarios) has been added to the RTP protocol handler to distinguish UDP packets
arriving from multiple sources to the same port and process only the expected packets
(those transmitted from the expected UDP source address). This resolves an issue identified
when multiple instances of FFmpeg subscribe to different Source-Specific Multicast streams
but with each sharing the same destination port.
Signed-off-by: Edward Torbett <ed.torbett@simulation-systems.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 17 Jul 2013 15:24:23 +0000 (18:24 +0300)]
avserver: Remove unused loadable module support
There is no record of this ever being used at all, anywhere,
since the feature was added in
2effd274466 .
This gets rid of extra linker tricks just to support a feature
that isn't used, simplifying portability to other platforms.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:56:15 +0000 (10:56 +0200)]
Fix pix_fmt detection in the native jpeg2000 decoder.
Based on
b7a928b by Michael Bradshaw.
Fixes ticket #2683.
Reviewed-by: Nicolas Bertrand
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:55:52 +0000 (10:55 +0200)]
lavf/concat: Never fail for sample aspect ratio 0:1.
Fixes ticket #2456.
Reviewed-by: Nicolas George
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:55:30 +0000 (10:55 +0200)]
lut3d: Fix reading 3dl files with leading comments.
Fixes ticket #2787.
Nicolas George [Thu, 18 Jul 2013 09:03:56 +0000 (11:03 +0200)]
lavfi/scale: allocate interlaced scalers only if needed.
Fix "Value 0.000000 for parameter 'srch' out of range"
error message when source or destination height is 1.
Note: since the av_opt_set_int() calls are not checked for
failure and the interlaced scalers are not actually used,
this error has no consequence apart from a frightening message
in the log.
James Almer [Thu, 18 Jul 2013 08:08:07 +0000 (05:08 -0300)]
vorbiscomment: Add DESCRIPTION to ff_vorbiscomment_metadata_conv
It's the official (or recommended) name for comment/description entries.
See https://www.xiph.org/vorbis/doc/v-comment.html
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 18 Jul 2013 08:44:40 +0000 (05:44 -0300)]
lavf/riff: Add ITRK tag
Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Jul 2013 07:53:47 +0000 (09:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Jul 2013 23:40:37 +0000 (01:40 +0200)]
Merge https://github.com/lukaszmluki/ffmpeg
* https://github.com/lukaszmluki/ffmpeg:
ftp: warning about pure-ftp server used as and output
ftp: comments
ftp: remove unused headers
ftp: fix interrupt callback misuse
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Jul 2013 03:19:46 +0000 (05:19 +0200)]
vf_scale: use sws_init_context()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fabian Neundorf [Wed, 17 Jul 2013 10:47:24 +0000 (12:47 +0200)]
lavf/matroskaenc: using valid chapter ids
Fixes ticket 2790, by starting the ChapterUIDs in mkv files with 1 instead of a 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 17 Jul 2013 18:19:24 +0000 (20:19 +0200)]
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Michael Niedermayer [Wed, 17 Jul 2013 14:53:22 +0000 (16:53 +0200)]
swscale/options: fix copy and paste typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Wed, 17 Jul 2013 00:37:15 +0000 (02:37 +0200)]
ftp: warning about pure-ftp server used as and output
Lukasz Marek [Wed, 17 Jul 2013 00:15:20 +0000 (02:15 +0200)]
ftp: comments