]>
git.sesse.net Git - ffmpeg/log
James Darnley [Wed, 27 Aug 2014 20:39:29 +0000 (22:39 +0200)]
Replace incorrect use of "multiply" with "multiple"
Also replace the plural form "multiplies" with "multiples".
Michael Niedermayer [Wed, 27 Aug 2014 21:53:53 +0000 (23:53 +0200)]
avformat/rtpdec_asf: fix compiler warning about const qualifier being discarded
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 21:52:40 +0000 (23:52 +0200)]
avformat/rdt: fix compiler warning about const qualifier being discarded
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 20:30:07 +0000 (22:30 +0200)]
avformat/aviobuf: remove uses of deprecated url_feof()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 19:20:39 +0000 (21:20 +0200)]
Merge commit '
8d27bf1cff35be406b0fd89d832e1852d4c573bc '
* commit '
8d27bf1cff35be406b0fd89d832e1852d4c573bc ':
x86: xvid: K&R formatting cosmetics
Conflicts:
libavcodec/x86/xvididct_sse2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 19:09:30 +0000 (21:09 +0200)]
Merge commit '
dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5 '
* commit '
dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5 ':
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 19:01:42 +0000 (21:01 +0200)]
Merge commit '
1f156af4274dc72d588620f6bedb4e9e66023c92 '
* commit '
1f156af4274dc72d588620f6bedb4e9e66023c92 ':
x86: xvid_idct: Drop unused definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 18:51:39 +0000 (20:51 +0200)]
Merge commit '
404731bd20e1df5880e6fe381e975ba48afc75b2 '
* commit '
404731bd20e1df5880e6fe381e975ba48afc75b2 ':
pulse: Set the wallclock option as default
Conflicts:
libavdevice/pulse_audio_dec.c
No change, the option was already default in FFmpeg since a long time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 18:38:34 +0000 (20:38 +0200)]
Merge commit '
ff771f79b55a346b4163d814b58ee4c98114745e '
* commit '
ff771f79b55a346b4163d814b58ee4c98114745e ':
vc1: Initialize start_code_found to 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 27 Aug 2014 18:39:50 +0000 (15:39 -0300)]
lavc/libwebpenc: use WebPMemoryWriterClear()
WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sun, 24 Aug 2014 15:09:45 +0000 (17:09 +0200)]
swr: aarch64 audio_convert and neon clobber test
Ported from avresample
Code by: Mans Rullgard, Janne Grunau, Martin Storsjo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 26 Aug 2014 23:13:52 +0000 (16:13 -0700)]
bktr: Fix Fabrice's name
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This file with the incorrect name was added after the name was fixed in all other files.
This is thus fixing a mistake
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 27 Aug 2014 00:31:14 +0000 (21:31 -0300)]
lavf/mp3enc: don't abort if audio packets can't be buffered
Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.
Signed-off-by: James Almer <jamrial@gmail.com>
Diego Biurrun [Wed, 27 Aug 2014 00:58:08 +0000 (02:58 +0200)]
x86: xvid: K&R formatting cosmetics
Jean-Francois Thibert [Tue, 26 Aug 2014 23:16:06 +0000 (19:16 -0400)]
Improved AC3 decoder level support (heavy drc, dialnorm)
Added support for AC3 heavy dynamic range compression used
to restrict the output range and added a setting to specify
the output target level and use the dialog normalization
field to apply it in the digital domain.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 11:13:51 +0000 (13:13 +0200)]
ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 27 Aug 2014 00:58:07 +0000 (02:58 +0200)]
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Diego Biurrun [Wed, 27 Aug 2014 00:58:06 +0000 (02:58 +0200)]
x86: xvid_idct: Drop unused definitions
Michael Niedermayer [Wed, 27 Aug 2014 10:52:34 +0000 (12:52 +0200)]
Merge commit '
f5245a9c6206878b892adf3ccbccc9311c202af5 '
* commit '
f5245a9c6206878b892adf3ccbccc9311c202af5 ':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Aug 2014 10:38:53 +0000 (12:38 +0200)]
Merge commit '
1688eef25385089026aba55da1885f70a57815ab '
* commit '
1688eef25385089026aba55da1885f70a57815ab ':
avconv: fix the muxrate values for -target
Conflicts:
ffmpeg_opt.c
No change, as ffmpegs muxrate is in bits/sec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 24 Aug 2014 12:13:45 +0000 (14:13 +0200)]
pulse: Set the wallclock option as default
Luca Barbato [Wed, 27 Aug 2014 00:50:58 +0000 (02:50 +0200)]
vc1: Initialize start_code_found to 0
Leftover of
a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e .
Michael Niedermayer [Wed, 27 Aug 2014 10:00:10 +0000 (12:00 +0200)]
Merge commit '
75bbaf2493a71ee66eaabe3c21fadd84d07888de '
* commit '
75bbaf2493a71ee66eaabe3c21fadd84d07888de ':
mpegenc: limit the maximum muxrate
Conflicts:
libavformat/mpegenc.c
See:
28d35dbe9f570025c220c08997bc11e21b3c1a66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 26 Aug 2014 06:26:35 +0000 (06:26 +0000)]
avconv: fix parsing the AVOptions for -target
CC: libav-stable@libav.org
Anton Khirnov [Mon, 25 Aug 2014 21:24:35 +0000 (21:24 +0000)]
avconv: fix the muxrate values for -target
The mpegenc private option values are in 50-byte units.
CC: libav-stable@libav.org
Anton Khirnov [Mon, 25 Aug 2014 21:21:57 +0000 (21:21 +0000)]
mpegenc: limit the maximum muxrate
It is written to the file as a 22-bit value.
CC: libav-stable@libav.org
Michael Niedermayer [Fri, 22 Aug 2014 20:36:55 +0000 (22:36 +0200)]
avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 20:01:45 +0000 (22:01 +0200)]
Merge commit '
e87f5e4e5f2e2e36b0b7826d708cda7049877af0 '
* commit '
e87f5e4e5f2e2e36b0b7826d708cda7049877af0 ':
h264: fully check cropping amount from sps
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 19:45:39 +0000 (21:45 +0200)]
Merge commit '
0a024268261d05ccdcf7e03c85fb78d22037a464 '
* commit '
0a024268261d05ccdcf7e03c85fb78d22037a464 ':
libxvid: K&R formatting cosmetics
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 18:48:07 +0000 (20:48 +0200)]
Merge commit '
56a721f020273d69daa8dcb0d99e42a43a0a0d4d '
* commit '
56a721f020273d69daa8dcb0d99e42a43a0a0d4d ':
doc: fix a typo
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 18:40:34 +0000 (20:40 +0200)]
Merge commit '
4c8bd8ddb049950347a5018fecbca7ee25d48c44 '
* commit '
4c8bd8ddb049950347a5018fecbca7ee25d48c44 ':
os_support: Adjust an outdated #endif comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ThomasVolkert [Tue, 26 Aug 2014 12:23:00 +0000 (14:23 +0200)]
avformat/rtpdec_h261: Fix sanity checks
Fixes mbap and quant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hii [Tue, 26 Aug 2014 06:55:14 +0000 (14:55 +0800)]
libx264: fix -b_qfactor and -chromaoffset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Tue, 26 Aug 2014 00:40:19 +0000 (20:40 -0400)]
h264: fully check cropping amount from sps
Even if sps.crop is true, the cropping amount may be zero.
Fixes a sample with a valid but broken container cropping.
Gabriel Dume [Wed, 20 Aug 2014 21:25:21 +0000 (17:25 -0400)]
libxvid: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Gabriel Dume [Mon, 25 Aug 2014 19:28:02 +0000 (15:28 -0400)]
doc: fix a typo
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Fri, 15 Aug 2014 07:46:03 +0000 (09:46 +0200)]
os_support: Adjust an outdated #endif comment
Michael Niedermayer [Tue, 26 Aug 2014 13:23:23 +0000 (15:23 +0200)]
avformat/utils: remove assert that tests the same condition as the if() directly above
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 13:21:25 +0000 (15:21 +0200)]
avformat/nsvdec: fix out-commented asserts so the function names exist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 13:20:58 +0000 (15:20 +0200)]
avcodec/snowenc: remove out-commented assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 12:04:39 +0000 (14:04 +0200)]
Merge commit '
4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9 '
* commit '
4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9 ':
mpeg: Write H264 streams at offset 2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 10:40:32 +0000 (12:40 +0200)]
Merge commit '
a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e '
* commit '
a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e ':
vc1: Fix the skip condition
Conflicts:
libavcodec/vc1_parser.c
See:
ede411dd03950b91c6346f2a3ae0e7546555f42f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Aug 2014 10:05:20 +0000 (12:05 +0200)]
Merge commit '
ab56fabe6294524e99815451ad01e4ff50c6d734 '
* commit '
ab56fabe6294524e99815451ad01e4ff50c6d734 ':
vfwcap: Add fallback define for HWND_MESSAGE
The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
commit
8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2
vfwcap: Drop fallback VfW defines
The defines were added long ago when MinGW still lacked them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 26 Aug 2014 03:24:39 +0000 (00:24 -0300)]
configure: update libvpx_vp9_encoder check
Required to add support for the aq_mode setting.
Any libvpx snapshot prior to 1.3.0 is not recommended for vp9 encoding for that matter.
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Luca Barbato [Fri, 8 Aug 2014 11:05:12 +0000 (13:05 +0200)]
mpeg: Write H264 streams at offset 2
It hints that the content is H264 according to HD-DVD.
Luca Barbato [Sun, 24 Aug 2014 17:34:13 +0000 (19:34 +0200)]
vc1: Fix the skip condition
As written in the comment above, skip must be added only if a
start code is found.
ThomasVolkert [Mon, 25 Aug 2014 22:51:59 +0000 (00:51 +0200)]
avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing
Diego Biurrun [Mon, 25 Aug 2014 15:26:15 +0000 (17:26 +0200)]
vfwcap: Add fallback define for HWND_MESSAGE
Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
Michael Niedermayer [Mon, 25 Aug 2014 22:27:28 +0000 (00:27 +0200)]
doc/snow: remove possibly wrong todo item
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 16:32:53 +0000 (18:32 +0200)]
ffplay: use av_malloc_array()
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strasser [Tue, 19 Aug 2014 22:41:55 +0000 (00:41 +0200)]
libavformat/ftp: Do not leak memory in routine ftp_features
Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.
Should fix CID1231988 (RESOURCE_LEAK)
OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Christophe Gisquet [Mon, 25 Aug 2014 20:24:30 +0000 (20:24 +0000)]
huffyuvdec: decode the last odd sample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 25 Aug 2014 20:24:29 +0000 (20:24 +0000)]
huffyuvenc: write last odd sample
If width is odd, last sample wouldn't be written.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 16:33:11 +0000 (18:33 +0200)]
avcodec/vp9: Use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Mon, 25 Aug 2014 16:15:13 +0000 (09:15 -0700)]
lavf/matroskadec: Ensure cues_end is initialized
Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.
This fixes coverity defect CID1231991.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 14:06:10 +0000 (16:06 +0200)]
avutil/opencl: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 14:03:54 +0000 (16:03 +0200)]
avcodec/vorbisenc: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 13:57:37 +0000 (15:57 +0200)]
doc/APIchanges: fill in dates and hashes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 18:01:40 +0000 (20:01 +0200)]
avcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2
Fixes bitrate detection in CBR mpeg2
Fixes ticket3678
Michael Niedermayer [Mon, 25 Aug 2014 11:26:42 +0000 (13:26 +0200)]
Merge commit '
6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f '
* commit '
6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f ':
libavformat: use MSG_NOSIGNAL when applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 10:27:19 +0000 (12:27 +0200)]
Merge commit '
b263f8ffe7599d9cd27ec477a12700da8eb2790d '
* commit '
b263f8ffe7599d9cd27ec477a12700da8eb2790d ':
lavf: add AVFormatContext.max_ts_probe
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Aug 2014 10:09:29 +0000 (12:09 +0200)]
Merge commit '
6ca11f7157d0ffd11ea9a4211b04981b46dc75d6 '
* commit '
6ca11f7157d0ffd11ea9a4211b04981b46dc75d6 ':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Wed, 20 Aug 2014 20:06:07 +0000 (23:06 +0300)]
libavformat: use MSG_NOSIGNAL when applicable
If the remote end of a connection oriented socket hangs up, generating
an EPIPE error is preferable over an unhandled SIGPIPE signal.
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Tue, 19 Aug 2014 17:49:58 +0000 (17:49 +0000)]
lavf: add AVFormatContext.max_ts_probe
It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.
Anton Khirnov [Sun, 18 May 2014 08:52:41 +0000 (10:52 +0200)]
doc/APIchanges: fill in missing hashes and dates
Michael Niedermayer [Mon, 25 Aug 2014 00:59:17 +0000 (02:59 +0200)]
Revert "pnmenc: use bits_per_raw_sample"
This reverts commit
1506ea947d3c527f67a5caa93cc7fa0d064bbf1f .
Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"
Michael Niedermayer [Mon, 25 Aug 2014 00:17:32 +0000 (02:17 +0200)]
avcodec/vc1dec: fix null pointer dereference
Fixes Ticket3860
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Fri, 22 Aug 2014 22:29:18 +0000 (18:29 -0400)]
ffserver: tests, use Metadata title in config
'Title' was deprecated with
9985710a5a927d52c345c4bdcc88f5c014ee2fe7
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Reynaldo H. Verdejo Pinochet [Wed, 20 Aug 2014 04:49:38 +0000 (00:49 -0400)]
ffserver: tests, use new port/bindaddress config
Comming from commit
1013d8dd6967f1e776c08dc133ed6ae44ca3dc64
the old Port and BindAddress config vars have been deprecated
in favor of HTTPPort and HTTPBindAddress respectively.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Michael Niedermayer [Sun, 24 Aug 2014 21:33:40 +0000 (23:33 +0200)]
avcodec/utils: add GBRP16 to avcodec_align_dimensions2()
Fixes Ticket3869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Aug 2014 19:01:29 +0000 (21:01 +0200)]
Merge commit '
424b929b5cb9ca4094099f25179829260d4b0fa3 '
* commit '
424b929b5cb9ca4094099f25179829260d4b0fa3 ':
pulse: Add a wallclock option to be compatible with other other captures
Conflicts:
libavdevice/pulse_audio_dec.c
wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Aug 2014 16:40:20 +0000 (18:40 +0200)]
avformat/matroskaenc: Check alpha_mode
Fixes CID1231992
Suggested-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 24 Aug 2014 13:33:10 +0000 (15:33 +0200)]
lavc/h264_slice: Add a missing newline to an error message.
Michael Niedermayer [Sun, 24 Aug 2014 12:53:31 +0000 (14:53 +0200)]
Merge remote-tracking branch 'ubitux/codecview'
* ubitux/codecview:
avfilter: add codecview filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 18 Aug 2014 14:32:26 +0000 (16:32 +0200)]
avfilter: add codecview filter
Luca Barbato [Sat, 23 Aug 2014 17:03:21 +0000 (19:03 +0200)]
pulse: Add a wallclock option to be compatible with other other captures
alsa and x11grab use av_gettime() to report timestamps.
Bug-Id: 647
Paul B Mahol [Sat, 23 Aug 2014 19:39:22 +0000 (19:39 +0000)]
Correct few "ffmpeg" typos
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 23 Aug 2014 19:22:13 +0000 (19:22 +0000)]
avcodec/xan: fix style issue
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Christophe Gisquet [Sun, 24 Aug 2014 08:46:30 +0000 (08:46 +0000)]
x86: hevc_mc: split differently calls
In some cases, 2 or 3 calls are performed to functions for unusual
widths. Instead, perform 2 calls for different widths to split the
workload.
The 8+16 and 4+8 widths for respectively 8 and more than 8 bits can't
be processed that way without modifications: some calls use unaligned
buffers, and having branches to handle this was resulting in no
micro-benchmark benefit.
For block_w == 12 (around 1% of the pixels of the sequence):
Before:
12758 decicycles in epel_uni, 4093 runs, 3 skips
19389 decicycles in qpel_uni, 8187 runs, 5 skips
22699 decicycles in epel_bi, 32743 runs, 25 skips
34736 decicycles in qpel_bi, 32733 runs, 35 skips
After:
11929 decicycles in epel_uni, 4096 runs, 0 skips
18131 decicycles in qpel_uni, 8184 runs, 8 skips
20065 decicycles in epel_bi, 32750 runs, 18 skips
31458 decicycles in qpel_bi, 32753 runs, 15 skips
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 24 Aug 2014 08:46:31 +0000 (08:46 +0000)]
x86: hevc_mc: correct unneeded use of SSE4 code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 20 Aug 2014 08:10:45 +0000 (08:10 +0000)]
pnmenc: use bits_per_raw_sample
This allows writing actual bitdepth in RGB48 when it isn't actually 16.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Aug 2014 02:11:37 +0000 (04:11 +0200)]
Changelog: add "H.261 RTP payload format (RFC 4587)"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Aug 2014 01:58:11 +0000 (03:58 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
fate: Fix ffprobe tests with --target-path set.
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Do not print a useless error number if mov header reading fails.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ThomasVolkert [Sat, 23 Aug 2014 19:25:39 +0000 (21:25 +0200)]
Add support for H.261 RTP payload format (RFC 4587)
Carl Eugen Hoyos [Sat, 16 Aug 2014 10:19:05 +0000 (12:19 +0200)]
fate: Fix ffprobe tests with --target-path set.
Carl Eugen Hoyos [Sun, 24 Aug 2014 00:49:06 +0000 (02:49 +0200)]
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Carl Eugen Hoyos [Sun, 24 Aug 2014 00:45:58 +0000 (02:45 +0200)]
Do not print a useless error number if mov header reading fails.
The error string is printed by ffmpeg as for other demuxers.
Michael Niedermayer [Sat, 23 Aug 2014 23:54:45 +0000 (01:54 +0200)]
avcodec/tiff: Make pixel format checks tighter
Fixes assertion failure with imgsrc001-lzma.tiff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 23 Aug 2014 02:39:57 +0000 (23:39 -0300)]
lavc/tiff: add support for LZMA compression
Derived from deflate code.
Requires liblzma.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 23 Aug 2014 20:46:06 +0000 (22:46 +0200)]
Merge commit '
749b1f1359b5af0a08221923b016551b18ab6171 '
* commit '
749b1f1359b5af0a08221923b016551b18ab6171 ':
configure: add --enable-rpath
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 23 Aug 2014 20:08:15 +0000 (22:08 +0200)]
Merge commit '
5caf039ba2b4be067568a30146f29008d8db28d0 '
* commit '
5caf039ba2b4be067568a30146f29008d8db28d0 ':
Prepare for 11_beta2 Release
Conflicts:
RELEASE
Not merged as theres no FFmpeg 11_beta2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 23 Aug 2014 19:39:14 +0000 (21:39 +0200)]
Merge commit '
f9f34cb9983ec6f4ef119c34b726d3b39c143110 '
* commit '
f9f34cb9983ec6f4ef119c34b726d3b39c143110 ':
ogg: Use separate classes for the aliases
Conflicts:
libavformat/oggenc.c
See:
2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 23 Aug 2014 18:03:10 +0000 (20:03 +0200)]
avutil/pixelutils: faster pixelutils_sad_16x16
501 to 439 decicycles.
See
45c7f3997ea11c3d1007b2126b1c0049a8c27105 .
Reinhard Tartler [Sat, 23 Aug 2014 14:04:26 +0000 (10:04 -0400)]
configure: add --enable-rpath
This option facilitates testing shared libarary builds: for instance
fate builders do no longer need to set LD_LIBRARY_PATH as the binaries will
get the right search paths hardcoded into their executable file.
This option is only meant to be used for testing purposes: The installed
libraries must not move around in the file system, and doing so will
cause a lot of subtle problems. For more information why using RPATH is
dangerous, please refer to
https://blog.flameeyes.eu/2010/06/the-why-and-how-of-rpath
Reinhard Tartler [Sat, 23 Aug 2014 14:12:16 +0000 (10:12 -0400)]
Prepare for 11_beta2 Release
Clément Bœsch [Sat, 23 Aug 2014 14:07:55 +0000 (16:07 +0200)]
doc/filters: fix Shwo/Show typo
Reimar Döffinger [Tue, 29 Jul 2014 19:16:35 +0000 (21:16 +0200)]
dict.c: Free non-strduped av_dict_set arguments on error.
Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Clément Bœsch [Thu, 14 Aug 2014 20:30:55 +0000 (22:30 +0200)]
avutil/pixelutils: faster pixelutils_sad_[au]_16x16
~560 → ~500 decicycles
This is following the comments from Michael in
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-August/160599.html
Using 2 registers for accumulator didn't help. On the other hand,
some re-ordering between the movs and psadbw allowed going ~538 to ~500.
Muhammad Faiz [Sat, 23 Aug 2014 08:01:22 +0000 (10:01 +0200)]
avfilter/showcqt: add fontcolor option
Michael Niedermayer [Thu, 21 Aug 2014 14:33:03 +0000 (16:33 +0200)]
avcodec/h264_slice: More complete cleanup in h264_slice_header_init()
Fixes null pointer dereference
Fixes Ticket3873
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>