]>
git.sesse.net Git - ffmpeg/log
Andreas Cadhalpun [Mon, 2 Mar 2015 14:46:44 +0000 (15:46 +0100)]
avformat/rm: limit packet size
The chunk size is limited to 0xFFFF (written by avio_wb16), so make
sure that the packet size is not too large.
Such large frames need to be split into slices smaller than 64 kB, but
that is currently supported neither by the rv10/rv20 encoders nor the rm
muxer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
See Ticket244
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 13:54:31 +0000 (14:54 +0100)]
avcodec/pngenc: replace round by lrint()
Avoids passing double to AV_WB32()
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 2 Mar 2015 13:56:05 +0000 (14:56 +0100)]
configure/help: consistently use "autodetect"
Claudio Freire [Sun, 1 Mar 2015 23:11:12 +0000 (20:11 -0300)]
avcodec/aacpsy: Fix AAC Psy PE reduction calculation when multiple iterations are required
This is a small change, but it does have a big impact on bit allocation.
all the regressions marked in the report have no audible
difference (I didn't check them all though), but the improvements can
be heard.
This affects mostly high bit rates. It's related to issue #2686.
In the report, A is the patched version, B is unpatched, all
comparisons show deltas in the form (A-B), so a positive pSNR delta
means a better quality in the patched version, and negative a
regression. Regressions are only considered for pSNR deltas below
-1db, they're considered serious below -6db.
All measurements were done with tiny_psnr.
The summary of the report inline for quick reading:
Files: 58
Bitrates: 6
Tests: 347
Serious Regressions: 0 (0%)
Regressions: 10 (2%)
Improvements: 54 (15%)
Big improvements: 26 (7%)
Worst regression - sine_tester.flac - 384k
- StdDev: 1.68 pSNR: -3.05 maxdiff: -178.00
Best improvement - 07 - Bound.flac - 384k
- StdDev: -1700.05 pSNR: 20.64 maxdiff: -29595.00
Average - StdDev: -55.67 pSNR: 1.20 maxdiff: -1593.00
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Mon, 2 Mar 2015 10:00:17 +0000 (11:00 +0100)]
MAINTAINERS: add myself as rtpdec_mpa_robust maintainer
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Mon, 2 Mar 2015 10:00:16 +0000 (11:00 +0100)]
avformat/rtpdec_mpa_robust: fix commit
96084251e57d1738fde02a2b0d37ca609d9efd71
Commit
96084251e57d1738fde02a2b0d37ca609d9efd71 introduced a change in
the parser implementation which broke it. Restore the original
implementation.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 22:59:49 +0000 (23:59 +0100)]
tests/fate: Add S302M test
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 22:10:02 +0000 (23:10 +0100)]
avfilter/af_aphaser: Change type to int as its accessed as int via AVOptions
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 22:09:35 +0000 (23:09 +0100)]
avfilter/af_biquads: Change width_type to int as its accessed as int via AVOptions
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 22:09:16 +0000 (23:09 +0100)]
avfilter/af_volume: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 22:08:46 +0000 (23:08 +0100)]
avfilter/avf_avectorscope: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 22:07:54 +0000 (23:07 +0100)]
avfilter/avf_showspectrum: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 21:50:37 +0000 (22:50 +0100)]
avcodec/libfdk-aacdec: Change conceal_method to int, its accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 21:49:25 +0000 (22:49 +0100)]
ffprobe: Change string_validation to int, its accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Mar 2015 01:32:55 +0000 (02:32 +0100)]
avfilter/vf_drawbox: Fix handling of max values
Fixes Ticket4332
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 21:34:10 +0000 (22:34 +0100)]
avutil/common: minor simplification in av_clip_intp2_c()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 1 Mar 2015 21:05:41 +0000 (18:05 -0300)]
x86/hevc_sao: use unaligned movs for sao_{band,filter} with width 8
Suggested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 27 Feb 2015 22:37:56 +0000 (23:37 +0100)]
avutil/opt: also test av_opt_show2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 16:29:33 +0000 (17:29 +0100)]
avutil/opt: Remove odd trailing whitespace bytes from flags help description
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 22:35:01 +0000 (23:35 +0100)]
avutil/opt: Also test/compare the av_log output i the selftest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 15:47:36 +0000 (16:47 +0100)]
avformat/mpegenc: Ignore max_delay if no other options remain
Fixes assertion failure
Fixes Ticket4335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 02:48:44 +0000 (03:48 +0100)]
avcodec/mips/Makefile: Build fmtconvert_mips only if CONFIG_FMTCONVERT is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Sat, 28 Feb 2015 22:15:41 +0000 (23:15 +0100)]
Revert "rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA"
This reverts commit
26524e358147aade6e9dd18fff42d61b966bbc70 .
If we want the T.140 codec to have the AV_CODEC_ID_TEXT codec id,
its type needs to be AVMEDIA_TYPE_SUBTITLE, so, keep interpreting
the text media type as AVMEDIA_TYPE_SUBTITLE.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Sat, 28 Feb 2015 22:15:40 +0000 (23:15 +0100)]
avformat: map T.140 RTP codec to text
This makes more sense than mapping to AV_CODEC_ID_SUBRIP. Nothing
indicates that a T.140 track contains subrip sub-titles.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 20:45:00 +0000 (21:45 +0100)]
avutil/ppc/intreadwrite: remove AV_??64 overriding code
The code has undefined behavior and makes no difference when optimizations
are enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gilles Chanteperdrix [Sat, 28 Feb 2015 22:15:39 +0000 (23:15 +0100)]
avfilter/af_volume: fix precision=fixed and volume=0 case
When precision is fixed and volume is 0, filter_frame does not
perform any operation on the output buffer. This works if the
output buffer has been allocated and zeroed with ff_get_audio_buffer
but not if the input buffer is used as output buffer.
Fix this by not using the input buffer as output buffer if
precision is fixed and volume is 0.
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:31:45 +0000 (01:31 +0100)]
Merge commit '
4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f '
* commit '
4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f ':
rtpenc: Don't set max_frames_per_packet based on the packet frame size or frame rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:31:26 +0000 (01:31 +0100)]
Merge commit '
bde2bba45c2f2df27a8534028bda09a6e7f835e2 '
* commit '
bde2bba45c2f2df27a8534028bda09a6e7f835e2 ':
rtpenc: Restructure if statements in packetizers to simplify adding more conditions
Conflicts:
libavformat/rtpenc_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:24:23 +0000 (01:24 +0100)]
Merge commit '
d4c7fc02f9f59e721e76debf4a595df529707545 '
* commit '
d4c7fc02f9f59e721e76debf4a595df529707545 ':
rtpenc: Skip redundant initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:23:32 +0000 (01:23 +0100)]
Merge commit '
f8c01257f93ceda3e03bc4e540a51022d1e2bff2 '
* commit '
f8c01257f93ceda3e03bc4e540a51022d1e2bff2 ':
rtpenc: Always do the default initialization regardless of codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:17:24 +0000 (01:17 +0100)]
Merge commit '
11edeaea3293c41ecf577a330422eabba35f76a2 '
* commit '
11edeaea3293c41ecf577a330422eabba35f76a2 ':
rtpenc_xiph: Don't exclude headers from max_payload_size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:17:10 +0000 (01:17 +0100)]
Merge commit '
7c1e2e64667421f931ab48141517f19d309c7eea '
* commit '
7c1e2e64667421f931ab48141517f19d309c7eea ':
rtpenc_xiph: Use AV_WB16 instead of manual bitshifts
Conflicts:
libavformat/rtpenc_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:08:00 +0000 (01:08 +0100)]
Merge commit '
d16c8d28d4e2fca3af1054ffbf635c8cee755fc8 '
* commit '
d16c8d28d4e2fca3af1054ffbf635c8cee755fc8 ':
rtpenc_aac: Use AV_WB16 instead of manual bitshifts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:07:42 +0000 (01:07 +0100)]
Merge commit '
9c9b0218e85fcd969308632f75af48a4ce229541 '
* commit '
9c9b0218e85fcd969308632f75af48a4ce229541 ':
rtpenc_aac: Merge a definition with a declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:00:57 +0000 (01:00 +0100)]
Merge commit '
1fc64e2e07787bbca82a72c146588e850e6d098a '
* commit '
1fc64e2e07787bbca82a72c146588e850e6d098a ':
rtpenc: Write conditional statements on separate lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Mar 2015 00:00:40 +0000 (01:00 +0100)]
Merge commit '
0662440b991361fdb5e732712d997a73e4692e34 '
* commit '
0662440b991361fdb5e732712d997a73e4692e34 ':
rtpenc_aac: Set a default value for max_frames_per_packet at init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 23:48:20 +0000 (00:48 +0100)]
Merge commit '
12b3459979f5ea6481660cd2c99a0381e2b5ba37 '
* commit '
12b3459979f5ea6481660cd2c99a0381e2b5ba37 ':
rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 23:48:00 +0000 (00:48 +0100)]
Merge commit '
98563953442560dd83aab938f86de3e5a22a891f '
* commit '
98563953442560dd83aab938f86de3e5a22a891f ':
rtpenc_aac: Fix sending fragmented frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 23:30:20 +0000 (00:30 +0100)]
Merge commit '
990e4a6639d0714198583c2812b1074b5751898f '
* commit '
990e4a6639d0714198583c2812b1074b5751898f ':
Add a QSV decoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 23:18:09 +0000 (00:18 +0100)]
Merge commit '
ea1d0b7ece1881c2f1360f8c1e2116791105af21 '
* commit '
ea1d0b7ece1881c2f1360f8c1e2116791105af21 ':
avcodec/utils: use correct printf specifier in ff_set_sar
See:
732c3ebffaff5005367d7f947fa903f3b6e92f68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 23:17:36 +0000 (00:17 +0100)]
Merge commit '
802987f8c7033ec8b82b35438d3822cf7f761166 '
* commit '
802987f8c7033ec8b82b35438d3822cf7f761166 ':
x11grab: Unbreak building
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 23:06:42 +0000 (00:06 +0100)]
Merge commit '
71f1ad37d858b810b71a4af1c25771beaa50b27b '
* commit '
71f1ad37d858b810b71a4af1c25771beaa50b27b ':
lavc: do not compile fmtconvert unconditionally
Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 22:56:45 +0000 (23:56 +0100)]
Merge commit '
d74a8cb7e42f703be5796eeb485f06af710ae8ca '
* commit '
d74a8cb7e42f703be5796eeb485f06af710ae8ca ':
fmtconvert: drop unused functions
Conflicts:
libavcodec/arm/fmtconvert_vfp_armv6.S
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fmtconvert_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 22:41:36 +0000 (23:41 +0100)]
Merge commit '
ee964145b5d229571e00bf6883a44189d02babe2 '
* commit '
ee964145b5d229571e00bf6883a44189d02babe2 ':
lavc: remove unused traces of fmtconvert usage
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 22:32:33 +0000 (23:32 +0100)]
Merge commit '
b9d2d6843a49f9df1d1ae1afe817d9b48c445919 '
* commit '
b9d2d6843a49f9df1d1ae1afe817d9b48c445919 ':
tls: Pass AVOptions dictionaries through to the chained protocol
Conflicts:
libavformat/tls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 22:20:39 +0000 (23:20 +0100)]
Merge commit '
e14f98c62fdf8744b07419314095d1b3248cce75 '
* commit '
e14f98c62fdf8744b07419314095d1b3248cce75 ':
tcp: Clarify the units for the timeout avoptions
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 22:02:36 +0000 (23:02 +0100)]
Merge commit '
c86d8aed748adc3ba8df96fb1fe14aa45da77a31 '
* commit '
c86d8aed748adc3ba8df96fb1fe14aa45da77a31 ':
avio: Rename avclass symbols relating to avio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 28 Feb 2015 19:58:31 +0000 (20:58 +0100)]
avformat/flvenc: check that the codec_tag fits in the available bits
flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 28 Feb 2015 19:11:36 +0000 (20:11 +0100)]
avcodec/utils: use correct printf specifier in ff_set_sar
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 28 Feb 2015 20:57:11 +0000 (21:57 +0100)]
avutil/imgutils: correctly check for negative SAR components
These could trigger assert failures previously
Found-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 25 Feb 2015 22:00:39 +0000 (00:00 +0200)]
rtpenc: Don't set max_frames_per_packet based on the packet frame size or frame rate
Instead check the timestamps while muxing, to avoid buffering a
too long timestamp range into one single packet.
This makes the AMR and AAC packetization slightly less efficient,
since we set a possibly unnecessarily high max_frames_per_packet.
(These packetizers end up doing a memmove of the TOC bytes if
sending a packet before max_frames_per_packet is achieved, and
we end up setting max_frames_per_packet to a value that should
be high enough for most uses.)
All packetizers that use max_frames_per_packet now set it either
to a default value, or to a value calculated based on other
parameters, so none of them rely on the previous default setting.
For iLBC, copy one frame at a time, to allow checking the timestamp
range for each of them - basically doing potentially multiple
loops to simplify the code instead of trying to calculate the
number of frames to buffer while honoring s1->max_delay.
This is in preparation for reducing the coupling between libavformat
and libavcodec, by not having the muxers use the encoder field
frame_size (which may not be available during e.g. stream copy).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Feb 2015 10:32:42 +0000 (12:32 +0200)]
rtpenc: Restructure if statements in packetizers to simplify adding more conditions
Factorize out the s->num_frames check at the start of the if statements,
simplifying adding more alternative causes for sending the buffered
frames.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 26 Feb 2015 11:37:56 +0000 (13:37 +0200)]
rtpenc: Skip redundant initialization
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 26 Feb 2015 11:33:59 +0000 (13:33 +0200)]
rtpenc: Always do the default initialization regardless of codecs
This avoids having to jump to the defaultcase in the switch. Manually
override the stream time base back to 90 kHz for the few audio codecs
that don't use the sample rate as time base (mp2, mp3).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 26 Feb 2015 11:39:17 +0000 (13:39 +0200)]
rtpenc_xiph: Don't exclude headers from max_payload_size
This makes things more consistent by using the variable in the same
way as in all other packetizers.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 26 Feb 2015 11:42:43 +0000 (13:42 +0200)]
rtpenc_xiph: Use AV_WB16 instead of manual bitshifts
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 25 Feb 2015 22:25:11 +0000 (00:25 +0200)]
rtpenc_aac: Use AV_WB16 instead of manual bitshifts
This makes the code slightly more readable and understandable.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 25 Feb 2015 22:21:03 +0000 (00:21 +0200)]
rtpenc_aac: Merge a definition with a declaration
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 25 Feb 2015 21:33:24 +0000 (23:33 +0200)]
rtpenc: Write conditional statements on separate lines
Intentionally keeping some conditional statements on single lines
in rtpenc_h263.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 25 Feb 2015 21:34:36 +0000 (23:34 +0200)]
rtpenc_aac: Set a default value for max_frames_per_packet at init
This avoids having to conditionally set the default within the
packetizer function.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Feb 2015 10:30:54 +0000 (12:30 +0200)]
rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
This doesn't fix any bug, but makes the code simpler for later
patches, and more straightforward to read as is.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 25 Feb 2015 21:55:58 +0000 (23:55 +0200)]
rtpenc_aac: Fix sending fragmented frames
After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't
zero, while s->num_frames is zero as intended. Using s->num_frames
makes it work as intended, and is less convoluted than keeping track
of (resetting) s->buf_ptr.
This avoids sending stray data after sending a fragmented aac packet.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Wed, 11 Feb 2015 23:07:29 +0000 (00:07 +0100)]
Add a QSV decoding example.
Andreas Cadhalpun [Sat, 28 Feb 2015 19:11:36 +0000 (20:11 +0100)]
avcodec/utils: use correct printf specifier in ff_set_sar
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christian Hujer [Fri, 27 Feb 2015 09:22:08 +0000 (10:22 +0100)]
x11grab: Unbreak building
The correct macro is DEC not D. Broken in
b31328d008985f87f0a7c83c700847cef1a4f08c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 21 Feb 2015 10:24:44 +0000 (11:24 +0100)]
lavc: do not compile fmtconvert unconditionally
Only ac3dec and dcadec use it.
Anton Khirnov [Sat, 21 Feb 2015 10:37:52 +0000 (11:37 +0100)]
fmtconvert: drop unused functions
Anton Khirnov [Sat, 21 Feb 2015 10:00:59 +0000 (11:00 +0100)]
lavc: remove unused traces of fmtconvert usage
Those decoders have been switched to float output and so do not use
fmtconvert anymore.
Martin Storsjö [Sat, 28 Feb 2015 00:15:55 +0000 (02:15 +0200)]
tls: Pass AVOptions dictionaries through to the chained protocol
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Feb 2015 23:37:18 +0000 (01:37 +0200)]
tcp: Clarify the units for the timeout avoptions
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 27 Feb 2015 23:06:28 +0000 (01:06 +0200)]
avio: Rename avclass symbols relating to avio
Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 27 Feb 2015 22:07:22 +0000 (23:07 +0100)]
avcodec/ppc/fdctdsp: fix const warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Optimize vc1_decode_i_block_adv()
9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1)
13855 -> 10976 decicycles (fate-suite/vc1/SA20021.vc1)
tests done by the author over this function but with the whole
patchset applied not just this commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Optimize vc1_decode_i_block()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Use av_clip_uintp2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Optimize vc1_decode_ac_coeff()
Avoid branches in sign handling
Move local variables to where they are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Simplify dcdiff initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Simplify dir_ptr / pred initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Simplify pred/mc loops
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Simplify dmv_y initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Simplify code setting and using extend_x/y
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Make init_block_index() inline
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: use uint8_t for size_table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: simplify offset table and access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Feb 2015 15:43:38 +0000 (16:43 +0100)]
ffmpeg: Fix -vstats when coded_frame is not set
There are several encoders which do not set coded_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Niklas Haas [Fri, 27 Feb 2015 20:31:38 +0000 (21:31 +0100)]
lavc/pngenc: Support writing colorspace tags.
These are defined in http://www.w3.org/TR/PNG/#11addnlcolinfo.
Michael Niedermayer [Fri, 27 Feb 2015 18:25:27 +0000 (19:25 +0100)]
avformat: Add prefix to get_codec_guid()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 18:23:46 +0000 (19:23 +0100)]
swscale: Add prefix to updateMMXDitherTables()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 18:20:43 +0000 (19:20 +0100)]
swresample: Add prefix to soxr_resampler
also move declaration to header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 18:17:23 +0000 (19:17 +0100)]
avcodec/dvdec: Make dv_iweight_720_c static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 18:08:09 +0000 (19:08 +0100)]
avcodec/v210dec: Add ff prefix to v210_x86_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 17:37:36 +0000 (18:37 +0100)]
avcodec/h264: Add ff_ prefix to the shared h264_init_dequant_tables() function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Fri, 27 Feb 2015 15:10:38 +0000 (16:10 +0100)]
lavf/mov: correct printf specifier
The type is int64_t.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 15:44:11 +0000 (16:44 +0100)]
avcodec/snow: mark dwt init as av_cold
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 15:39:30 +0000 (16:39 +0100)]
avcodec/diracdsp: Mark ff_diracdsp_init() as av_cold
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 15:38:08 +0000 (16:38 +0100)]
avcodec/mjpegenc: Mark ff_mjpeg_encode_close() as av_cold
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Feb 2015 15:15:31 +0000 (16:15 +0100)]
postproc: mark alloc/free context functions as av_cold
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Thu, 26 Feb 2015 13:47:01 +0000 (13:47 +0000)]
movenc: Write 'colr' box correctly for MP4
This also restricts it to MOV and MP4, since it is only
defined for those formats.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>