OSDN Git Service
wm4 [Tue, 2 Sep 2014 18:53:08 +0000 (20:53 +0200)]
avformat/samidec: UTF-16 support
ff_smil_extract_next_chunk() is still used by RealText.
wm4 [Tue, 2 Sep 2014 18:52:07 +0000 (20:52 +0200)]
avformat/srtdec: UTF-16 support
wm4 [Tue, 2 Sep 2014 18:48:45 +0000 (20:48 +0200)]
avformat/assdec: UTF-16 support
Use the UTF-16 BOM to detect UTF-16 encoding. Convert the file contents
to UTF-8 on the fly using FFTextReader, which acts as converting wrapper
around AVIOContext. It also can work on a static buffer, needed for
format probing. The FFTextReader wrapper now also takes care of skipping
the UTF-8 BOM.
Fix Ticket #3496.
Michael Niedermayer [Fri, 5 Sep 2014 15:14:50 +0000 (17:14 +0200)]
avcodec/mpegvideo: set codec tags in ff_mpv_decode_init()
Fixes Ticket3912
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Sep 2014 14:57:57 +0000 (16:57 +0200)]
avcodec/mpegvideo: Factor ff_mpv_decode_init() out
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 5 Sep 2014 15:43:59 +0000 (17:43 +0200)]
lavd/v4l2: simplify list_formats()
We can avoid passing file descriptor fd explicitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Sep 2014 17:29:41 +0000 (19:29 +0200)]
Merge commit '
2143948381c8118bdc2f50bd4079520b9885bd54'
* commit '
2143948381c8118bdc2f50bd4079520b9885bd54':
Drop unnecessary av_unused attributes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 5 Sep 2014 17:32:41 +0000 (17:32 +0000)]
MAINTAINERS: fix typo
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 2 Jul 2014 09:39:07 +0000 (09:39 +0000)]
add silenceremove filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 5 Sep 2014 17:24:49 +0000 (19:24 +0200)]
Merge commit '
213e606752d16f51337e94431962fb5d7749c07e'
* commit '
213e606752d16f51337e94431962fb5d7749c07e':
Replace av_unused attributes by block structures
Conflicts:
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Sep 2014 17:15:52 +0000 (19:15 +0200)]
Merge commit '
096a1d5b46391f65dfd0bee6292e9962f53bd7c8'
* commit '
096a1d5b46391f65dfd0bee6292e9962f53bd7c8':
rdft: Move some variables into a separate block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Sep 2014 17:08:27 +0000 (19:08 +0200)]
Merge commit '
b574e1e97ea7067a5fcd3876e30a67df0e4e6611'
* commit '
b574e1e97ea7067a5fcd3876e30a67df0e4e6611':
get_bits: Add OPEN_READER macro variant w/o size_plus8
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 5 Sep 2014 15:39:50 +0000 (17:39 +0200)]
lavd/v4l2: simplify list_framesizes()
We can avoid passing file descriptor fd explicitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 5 Sep 2014 15:34:51 +0000 (17:34 +0200)]
lavd/v4l2: remove unneeded variable in device_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 5 Sep 2014 15:24:43 +0000 (17:24 +0200)]
lavd/v4l2: simplify first_field()
There is no need to pass fd as a second parameter. Additionally remove
unneeded curly braces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 5 Sep 2014 15:12:39 +0000 (17:12 +0200)]
lavd/v4l2: Replace s1 with ctx for consistency.
No functional change in the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 5 Sep 2014 14:26:11 +0000 (16:26 +0200)]
MAINTAINERS: add myself as lavd/v4l2 maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Henrik Gramner [Thu, 4 Sep 2014 22:13:38 +0000 (00:13 +0200)]
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
Previously there was a limit of two cpuflags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 2 Sep 2014 21:25:07 +0000 (23:25 +0200)]
Drop unnecessary av_unused attributes.
Diego Biurrun [Tue, 2 Sep 2014 21:23:03 +0000 (23:23 +0200)]
Replace av_unused attributes by block structures
This is more portable and avoids warnings with compilers that do not
properly support av_unused.
Diego Biurrun [Fri, 29 Aug 2014 14:56:20 +0000 (16:56 +0200)]
rdft: Move some variables into a separate block
This avoids an unused variable warning with hardcoded tables.
Diego Biurrun [Fri, 22 Aug 2014 12:37:39 +0000 (14:37 +0200)]
get_bits: Add OPEN_READER macro variant w/o size_plus8
This avoids a trillion warnings from MSVC.
Benoit Fouet [Fri, 5 Sep 2014 09:15:13 +0000 (11:15 +0200)]
tiff: fix {2,4}bpp grayscale palettes.
Create a default grayscale palette for 2 or 4 bpp grayscale tiff, if
there is no palette defined.
Fixes ticket #3915
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Thu, 4 Sep 2014 22:22:04 +0000 (00:22 +0200)]
vfi/x86/vf_idet: fix incorrect use of paddq
paddq is an SSE2 instruction so it cannot be used for MMX.
This was probably just a typo because the sums are dwords anyway.
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pascal Massimino [Fri, 5 Sep 2014 09:59:03 +0000 (11:59 +0200)]
avfilter/x86/idet: fix license header (GPL -> LGPL)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)]
Merge commit '
b21e989a3c076d94cfdde0303724db841dd60cad'
* commit '
b21e989a3c076d94cfdde0303724db841dd60cad':
ismindex: produce .ismf file
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mark Harris [Thu, 4 Sep 2014 20:19:44 +0000 (13:19 -0700)]
doc/filters.texi: fix time duration references
Make time duration references consistent, using @ref links, and
eliminate incorrect syntax [-]HH[:MM[:SS[.m...]]].
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Mon, 1 Sep 2014 12:04:54 +0000 (14:04 +0200)]
lavf/ffmdec: return proper error code in ffm2_read_header()
Also log an error message in case of invalid packet size.
Stefano Sabatini [Mon, 1 Sep 2014 11:10:04 +0000 (13:10 +0200)]
lavc/libvpxenc: show crf CQ value in error message
Mika Raento [Thu, 4 Sep 2014 15:09:46 +0000 (18:09 +0300)]
ismindex: produce .ismf file
This is a non-standard file that maps the MSS segment names to offsets
in the ISMV file. This can be used to build a custom MSS streaming
server without splitting the ISMV into separate files.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 5 Sep 2014 02:45:30 +0000 (04:45 +0200)]
Merge commit '
d7913bf59ccbf781ce57c5d58998e8f25d10e040'
* commit '
d7913bf59ccbf781ce57c5d58998e8f25d10e040':
changelog: Move Ogg subtypes aliases entry to the correct release
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 5 Sep 2014 02:33:14 +0000 (23:33 -0300)]
x86/hevc_res_add: add missing guards to hevc_transform_add32_8_avx2
Should fix compilation with old Yasm/Nasm versions.
Signed-off-by: James Almer <jamrial@gmail.com>
Henrik Gramner [Thu, 4 Sep 2014 22:13:34 +0000 (00:13 +0200)]
x86inc: Make ym# behave the same way as xm#
This makes more sense for future implementations of templates with zmm registers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Loren Merritt [Thu, 4 Sep 2014 22:13:37 +0000 (00:13 +0200)]
x86inc: free up variable name "n" in global namespace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 1 Sep 2014 02:43:02 +0000 (23:43 -0300)]
x86/hevc_res_add: add ff_hevc_transform_add32_8_avx2
~20% faster than AVX.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 4 Sep 2014 22:31:39 +0000 (00:31 +0200)]
avutil/md5: workaround clang 3.5 #20849
This avoids several failures on fate.ffmpeg.org, and thus makes real
bugs easier to spot
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Thu, 4 Sep 2014 22:13:35 +0000 (00:13 +0200)]
lavc/x86/v210: give cpuflag to INIT macro
This lets the cglobal macro automatically append a suffix to the function name.
This means that INIT_XMM avx must be used rather than INIT_AVX.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 4 Sep 2014 15:30:39 +0000 (08:30 -0700)]
changelog: Move Ogg subtypes aliases entry to the correct release
skal [Wed, 3 Sep 2014 09:02:32 +0000 (11:02 +0200)]
avfilter/vf_idet: MMX/MMXEXT/SSE2 implementation of idet's filter_line()
integration by Neil Birkbeck, with help from Vitor Sessak.
core SSE2 loop by Skal (pascal.massimino@gmail.com)
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 18:50:01 +0000 (20:50 +0200)]
Merge commit '
d9792b773516a560ecb99694b8ee745a50027fac'
* commit '
d9792b773516a560ecb99694b8ee745a50027fac':
Mark 11 release in the changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 18:20:02 +0000 (20:20 +0200)]
Merge commit '
12f0388f9cb32016ac0dacaeca631b088b29bb96'
* commit '
12f0388f9cb32016ac0dacaeca631b088b29bb96':
Add release notes for 11.
Conflicts:
doc/RELEASE_NOTES
Mostly not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 18:00:01 +0000 (20:00 +0200)]
Merge commit '
4d55e9de27894ddfb337b28cd7aa6d14a12666d2'
* commit '
4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
vc1: Split bits used in libavformat into a separate header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 17:46:06 +0000 (19:46 +0200)]
Merge commit '
f20518568a77a6138fc74021ce56013ab72907ba'
* commit '
f20518568a77a6138fc74021ce56013ab72907ba':
build: Split WMA frequencies into a separate object file
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 17:18:08 +0000 (19:18 +0200)]
Merge commit '
803f8992f11d1eb301672cd13c685a7b1d04c467'
* commit '
803f8992f11d1eb301672cd13c685a7b1d04c467':
build: cosmetics: Group hwaccel OBJS declarations together
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 17:10:28 +0000 (19:10 +0200)]
Merge commit '
2b8b0da09cf0dc2535de42f95110eb633f36d8c8'
* commit '
2b8b0da09cf0dc2535de42f95110eb633f36d8c8':
fdctdsp: cosmetics: Drop one unnecessary if-block level
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 2 Sep 2014 22:43:29 +0000 (00:43 +0200)]
Mark 11 release in the changelog
Also fix some typos in the entries for the 11 release.
Anton Khirnov [Mon, 18 Aug 2014 18:04:47 +0000 (18:04 +0000)]
Add release notes for 11.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Mon, 1 Sep 2014 20:57:24 +0000 (13:57 -0700)]
vc1: Split bits used in libavformat into a separate header
This reduces inter-library dependencies.
Andreas Cadhalpun [Thu, 28 Aug 2014 11:15:50 +0000 (13:15 +0200)]
Remove non-free tests/lena.pnm and adapt FATE tests to depend on lena.pnm in the SAMPLES directory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Steven Liu [Thu, 4 Sep 2014 12:23:19 +0000 (20:23 +0800)]
avformat/flvdec: read the correct bits into the tag type
from the flv spec, the flvtag define the tagtype as one byte,
the spec desc is:
Reserved UB[2] Reserved for FMS, should be 0
Filter UB[1] Indicates if packets are filtered.
0 = No pre-processing required.
1 = Pre-processing (such as decryption) of the packet is
required before it can be rendered.
Shall be 0 in unencrypted files, and 1 for encrypted
tags.
See Annex F. FLV Encryption for the use of filters.
TagType UB[5] Type of contents in this tag. The following types are
defined:
8 = audio
9 = video
18 = script data
Signed-off-by: Steven Liu <qi.liu@chinacache.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 3 Sep 2014 10:27:27 +0000 (03:27 -0700)]
build: Split WMA frequencies into a separate object file
These are the only WMA bits shared with binkaudio. Splitting them off
reduces the binnkaudio dependency on general WMA code.
Diego Biurrun [Mon, 1 Sep 2014 12:35:58 +0000 (05:35 -0700)]
build: cosmetics: Group hwaccel OBJS declarations together
Dmitry Volyntsev [Wed, 3 Sep 2014 11:46:03 +0000 (15:46 +0400)]
libavdevice/v4l2: fix descriptors leak on error paths
Signed-off-by: Dmitry Volytnsev <xeioexception@gmail.com>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 02:09:59 +0000 (04:09 +0200)]
avdevice/x11grab: fix error handling in pixel formats
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Sep 2014 01:49:10 +0000 (03:49 +0200)]
postproc: use FFMIN/FFMAX where appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 1 Sep 2014 02:39:35 +0000 (19:39 -0700)]
Use makeinfo to generate html doc for the new website
texi2html is deprecated by upstream in favor of makeinfo/texi2any. See:
- https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html
- https://wiki.debian.org/Texi2htmlTransition
- https://lists.debian.org/debian-devel/2013/05/msg01516.html
This is actually two separate changes.
Based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>.
Fixes Trac ticket #3232.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Michael Niedermayer [Wed, 3 Sep 2014 20:03:21 +0000 (22:03 +0200)]
Merge commit '
d2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'
* commit '
d2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
wma: K&R formatting cosmetics
Conflicts:
libavcodec/wma.c
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 2 Sep 2014 22:22:41 +0000 (00:22 +0200)]
vorbisenc: avoid large stack allocation.
Code is only used during initialization, so malloc/free
should be fine to use.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 2 Sep 2014 21:59:56 +0000 (23:59 +0200)]
svq1enc: remove pointless array element.
Not sure it was meant to be used for something at some point though.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 2 Sep 2014 18:31:39 +0000 (20:31 +0200)]
ffv1enc: reduce stack usage.
A bit more complex than e.g. adding it to the context, but
using the context for something that will be used only during
initialization seemed a bit wasteful.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Lou Logan [Fri, 29 Aug 2014 00:26:11 +0000 (16:26 -0800)]
doc/demuxers: document gif demuxer
Signed-off-by: Lou Logan <lou@lrcd.com>
Jörg Krause [Wed, 3 Sep 2014 09:53:39 +0000 (11:53 +0200)]
libavutil/error: fix build with musl toolchain
Add the feature test macro which is required for building with the
musl toolchain.
The feature test macro _XOPEN_SOURCE = 600 provides the XSI-compliant
version of strerror_r().
Signed-off-by: Jörg Krause <jkrause@posteo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 13:04:30 +0000 (15:04 +0200)]
Merge commit '
c487972ed0e1eaebdbe4a13cdd191e119be0b19c'
* commit '
c487972ed0e1eaebdbe4a13cdd191e119be0b19c':
ismindex: recover from completely empty streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 12:56:12 +0000 (14:56 +0200)]
Merge commit '
95e177eeb21f3e968aa9353bc69d1946966cc835'
* commit '
95e177eeb21f3e968aa9353bc69d1946966cc835':
rtpdec: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpdec_hevc.c
libavformat/version.h
See:
96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 12:24:53 +0000 (14:24 +0200)]
Merge commit '
ebef9f5a56d7df91e010a177a80cfc8dbe394305'
* commit '
ebef9f5a56d7df91e010a177a80cfc8dbe394305':
time: Use clock_gettime if the monotonic clock is available
Conflicts:
configure
The change to av_gettime() isnt merged, a patch will be posted to the mailing list
that would do the switch
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 11:58:41 +0000 (13:58 +0200)]
Merge commit '
65e78a2e4b111627c0ebdf2c9baec95e5e21560d'
* commit '
65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
x11grab: Refactor pixel format parsing
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 11:29:49 +0000 (13:29 +0200)]
Merge commit '
bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'
* commit '
bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
x11grab: Fallback to normal XImage if SHM is not supported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 11:11:55 +0000 (13:11 +0200)]
Merge commit '
c19a49e565bd06ea47947d50779ba236df9d4943'
* commit '
c19a49e565bd06ea47947d50779ba236df9d4943':
ppc: Support little endian intreadwrite
Conflicts:
libavutil/ppc/intreadwrite.h
See:
d37c620c84e28400ad071d1c75cc81445b4acb29
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 10:52:34 +0000 (12:52 +0200)]
avformat/mpegts: Change order of structs to match
7968059e5c3cd8f91407f379c11bbf71a1b84c74
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 10:44:14 +0000 (12:44 +0200)]
Merge commit '
7968059e5c3cd8f91407f379c11bbf71a1b84c74'
* commit '
7968059e5c3cd8f91407f379c11bbf71a1b84c74':
mpegts: Allow custom max resync size
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 10:24:47 +0000 (12:24 +0200)]
Merge commit '
94f084324e648876508bed546d950762f10b875e'
* commit '
94f084324e648876508bed546d950762f10b875e':
texi2pod: Make it output a single encoding string
Conflicts:
doc/texi2pod.pl
See:
12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 28 Aug 2014 19:49:38 +0000 (12:49 -0700)]
fdctdsp: cosmetics: Drop one unnecessary if-block level
Michael Niedermayer [Wed, 3 Sep 2014 10:10:01 +0000 (12:10 +0200)]
Merge commit '
4912b634b517c8acfc476c5d47f10be83fe7e18b'
* commit '
4912b634b517c8acfc476c5d47f10be83fe7e18b':
x265: Use the encoder defaults
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Gabriel Dume [Tue, 2 Sep 2014 19:28:50 +0000 (15:28 -0400)]
wma: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Mika Raento [Wed, 3 Sep 2014 06:13:46 +0000 (09:13 +0300)]
ismindex: recover from completely empty streams
This creates best-effort results from input that is missing stream
contents, there are warnings printed when this happens.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 3 Sep 2014 02:52:50 +0000 (04:52 +0200)]
avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 03:18:09 +0000 (05:18 +0200)]
avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 02:13:37 +0000 (04:13 +0200)]
Merge commit '
eda7571ea1a41c835e3a02fa9517e5bc67d7adce'
* commit '
eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
wmv2: K&R formatting cosmetics
Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 01:55:23 +0000 (03:55 +0200)]
Merge commit '
7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '
7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See:
298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Sep 2014 01:18:07 +0000 (03:18 +0200)]
Merge commit '
95c0cec03acec0a80cc1c7db48f3b2355d9e767b'
* commit '
95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
idctdsp: Add global function pointers for {add|put}_pixels_clamped functions
Conflicts:
libavcodec/arm/idctdsp_init_arm.c
libavcodec/dct.h
libavcodec/idctdsp.c
libavcodec/jrevdct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Tue, 26 Aug 2014 19:00:03 +0000 (21:00 +0200)]
rtpdec: HEVC/H.265 support
As specified in draft-ietf-payload-rtp-h265-06.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 24 Aug 2014 16:14:47 +0000 (18:14 +0200)]
time: Use clock_gettime if the monotonic clock is available
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 10 Aug 2014 15:32:18 +0000 (17:32 +0200)]
x11grab: Refactor pixel format parsing
Luca Barbato [Sat, 9 Aug 2014 19:37:02 +0000 (21:37 +0200)]
x11grab: Fallback to normal XImage if SHM is not supported
Luca Barbato [Thu, 28 Aug 2014 17:40:45 +0000 (19:40 +0200)]
ppc: Support little endian intreadwrite
Luca Barbato [Mon, 25 Aug 2014 10:11:32 +0000 (12:11 +0200)]
mpegts: Allow custom max resync size
Luca Barbato [Sun, 31 Aug 2014 23:30:44 +0000 (01:30 +0200)]
texi2pod: Make it output a single encoding string
Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.
Luca Barbato [Thu, 28 Aug 2014 01:49:05 +0000 (03:49 +0200)]
x265: Use the encoder defaults
Reset the settings as it is done for x264.
Gabriel Dume [Tue, 2 Sep 2014 19:28:51 +0000 (15:28 -0400)]
wmv2: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Pascal Massimino [Wed, 27 Aug 2014 00:58:10 +0000 (02:58 +0200)]
xvid: Add C IDCT
Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sun, 31 Aug 2014 18:45:15 +0000 (11:45 -0700)]
idctdsp: Add global function pointers for {add|put}_pixels_clamped functions
These function pointers already existed in the ARM code. Adding them globally
allows calls to the function pointers to access arch-optimized versions of the
functions transparently.
Michael Niedermayer [Tue, 2 Sep 2014 20:18:12 +0000 (22:18 +0200)]
Merge commit '
91d305790ea0f6fe0f54b48236da42181c39c18b'
* commit '
91d305790ea0f6fe0f54b48236da42181c39c18b':
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Sep 2014 20:07:06 +0000 (22:07 +0200)]
Merge commit '
ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
* commit '
ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Sep 2014 19:57:46 +0000 (21:57 +0200)]
Merge commit '
f61e47dd68582529bcf6d42d861c70a320cd1b67'
* commit '
f61e47dd68582529bcf6d42d861c70a320cd1b67':
asv: K&R formatting cosmetics
Conflicts:
libavcodec/asvdec.c
libavcodec/asvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Sep 2014 19:45:58 +0000 (21:45 +0200)]
Merge commit '
74512f7e369da40e1148c92b58cd8e59f7737b8f'
* commit '
74512f7e369da40e1148c92b58cd8e59f7737b8f':
8svx: Return proper error codes
Conflicts:
libavcodec/8svx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 1 Sep 2014 21:47:12 +0000 (23:47 +0200)]
vf_deshake: Avoid doing a malloc+free for every single frame.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 1 Sep 2014 21:36:29 +0000 (23:36 +0200)]
vf_deshake: reduce stack usage.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 1 Sep 2014 21:08:56 +0000 (23:08 +0200)]
rangecoder-test: Allow running with small stack size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 31 Aug 2014 18:07:40 +0000 (20:07 +0200)]
rl.h: Use on-stack temporary VLC tables instead of having them static.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 31 Aug 2014 12:05:49 +0000 (14:05 +0200)]
rl.h: remove deprecated and now unused vlc member.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>