]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 7 Sep 2014 22:45:02 +0000 (00:45 +0200)]
Merge commit '
fcf597625c7a991ca389f3a9b8ff4f5e383301c0 '
* commit '
fcf597625c7a991ca389f3a9b8ff4f5e383301c0 ':
ismindex: Avoid writing ismf files if no base name has been specified
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Sep 2014 22:38:26 +0000 (00:38 +0200)]
Merge commit '
803e82276b3716bf6012ec69e8854dae14a4fd2b '
* commit '
803e82276b3716bf6012ec69e8854dae14a4fd2b ':
libavformat: Check mkdir return error codes
Conflicts:
libavformat/hdsenc.c
libavformat/smoothstreamingenc.c
See:
c89f8f80cc83622471eaf99e451e78df68475e19
See:
a3886ea3c5947ca05bfe01b053d9ce2f9725d9eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Mon, 1 Sep 2014 17:12:09 +0000 (13:12 -0400)]
ffserver: tests, force +global_header for ASF
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Martin Storsjö [Fri, 5 Sep 2014 19:50:24 +0000 (22:50 +0300)]
ismindex: Avoid writing ismf files if no base name has been specified
Previously, this could create files named "(null).ismf", if the -ismf
parameter is specified (before an input file name), but without
specifying any base name.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 5 Sep 2014 19:45:11 +0000 (22:45 +0300)]
libavformat: Check mkdir return error codes
Previously, the returned error codes were intentionally ignored
(see
fadd3a68213 ), to avoid aborting if the directory already
existed. If the mkdir actually failed, this was caught when
opening files within the directory fails anyway.
By handling the error code here (but explicitly ignoring EEXIST),
the error messages and return codes in these cases are more
appropriate and less confusing.
Signed-off-by: Martin Storsjö <martin@martin.st>
Andreas Cadhalpun [Sat, 6 Sep 2014 21:49:43 +0000 (23:49 +0200)]
doc/filters.texi: improve the wording of the expr_int_format documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Sep 2014 14:39:39 +0000 (16:39 +0200)]
avformat/m4vdec: Check for non startcode 00 00 00 sequences in probe
Fixes miss detection of PCM as m4v
Fixes Ticket 3928
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Sep 2014 12:14:52 +0000 (14:14 +0200)]
avcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change()
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Sep 2014 11:00:47 +0000 (13:00 +0200)]
avcodec/mpegvideo: check that the context is initialized in ff_mpv_common_frame_size_change()
The function otherwise would initialize the context without setting context_initialized
alternatively we could set context_initialized
Fixes valgrind anomalies related to ticket 3928
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Sep 2014 10:52:24 +0000 (12:52 +0200)]
avcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_change()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Sep 2014 10:51:08 +0000 (12:51 +0200)]
avcodec/mpegvideo: free_context_frame() cannot fail, make it return void
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 7 Sep 2014 11:12:41 +0000 (13:12 +0200)]
doc/muxers/segment: reword text for examples, improve consistency
Stefano Sabatini [Sat, 6 Sep 2014 13:43:11 +0000 (15:43 +0200)]
lavf/segment: add segment_format_options option
Reimar Döffinger [Sat, 6 Sep 2014 19:22:36 +0000 (21:22 +0200)]
libswresample: move condition to start of loop.
This avoids several issue like calculating sum/maxcoef
incorrectly due to adding up matrix entries that will
be overwritten, as well as out-of-range writes to
s->matrix if the maximum allowed number of channels is used.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 6 Sep 2014 19:18:58 +0000 (21:18 +0200)]
Remove pointless if.
A branch to avoid some calculation seems unlikely to have any benefits.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 2 Sep 2014 21:50:55 +0000 (23:50 +0200)]
libswresample: Avoid needlessly large on-stack array.
We only actually need to use a tiny part of it.
Unfortunately we seem to have no real test coverage on
the code, so this is a bit risky.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sat, 6 Sep 2014 02:42:48 +0000 (04:42 +0200)]
ffmpeg: Copy extradata if it has been initialized later from the encoder
Fixes Ticket3909
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Sep 2014 23:42:28 +0000 (01:42 +0200)]
avcodec/h264: Allow partial escaping
Fixes Ticket3923
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Sep 2014 14:42:33 +0000 (16:42 +0200)]
avformat/swfdec: Do not change the pixel format
This is currently not supported
Fixes part of Ticket 3539
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Sep 2014 10:56:03 +0000 (12:56 +0200)]
avfilter/af_silenceremove: remove dead code
Fixes CID1237284
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Sep 2014 10:40:34 +0000 (12:40 +0200)]
avcodec/hevc_ps: Always initialize backup in decode_vui()
Fixes CID1237283
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 6 Sep 2014 19:28:53 +0000 (21:28 +0200)]
RELEASE_NOTES: mention the ffplay -autoexit behaviour change
Reimar Döffinger [Tue, 2 Sep 2014 19:56:43 +0000 (21:56 +0200)]
huffyuvdec: avoid large stack use.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 31 Aug 2014 10:42:51 +0000 (12:42 +0200)]
cabac: Allow hardcoding CABAC table.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 30 Aug 2014 16:17:39 +0000 (18:17 +0200)]
cabac: initialize all of ff_h264_cabac_tables programmatically.
Moves it from .data to .bss, slightly reducing binary size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 30 Aug 2014 15:27:57 +0000 (17:27 +0200)]
aacsbr: support hardcoding tables.
For sbr_qmf_window_us there is even a question if it maybe
should be fully hardcoded all the time.
Since half of it is coded, it ends up in .data and not .bss.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Mickaël Raulet [Sat, 6 Sep 2014 17:05:21 +0000 (19:05 +0200)]
avcodec/hevc: fix dead code
fix CID
1231985
cherry picked from commit
745a35a777eaa5f77b8660b44098110a29916aae
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Sep 2014 18:22:14 +0000 (20:22 +0200)]
ffplay: make autoexit the default
See:
f9bc65e399d1883da21ae03d07b09348a11a5f49
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Sep 2014 18:20:44 +0000 (20:20 +0200)]
Merge commit '
041caf1a63f091745b95a6d51c23fbdcb604d4ce '
* commit '
041caf1a63f091745b95a6d51c23fbdcb604d4ce ':
avplay: Exit by default at the end of playback
Conflicts:
Changelog
ffplay.c
Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit,
the change of the default will be implemented in the next commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 6 Sep 2014 10:06:39 +0000 (12:06 +0200)]
avformat/mpegts: fix spelling error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 2 Sep 2014 22:45:21 +0000 (00:45 +0200)]
avplay: Exit by default at the end of playback
This is the expected behavior shared by all other cli multimedia players.
Bug-Id: 732
Clément Bœsch [Sat, 6 Sep 2014 11:47:59 +0000 (13:47 +0200)]
avfilter/ebur128: rework channel weighting definition code
Should fix CID1194399 (Bad bit shift operation)
Michael Niedermayer [Sat, 6 Sep 2014 01:13:57 +0000 (03:13 +0200)]
avcodec/mjpegdec: fix rounding of chroma_height
Fixes green line at the bottom
Fixes Ticket3913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
db0company [Fri, 5 Sep 2014 18:31:16 +0000 (20:31 +0200)]
doc: Copyright in CSS, CSS split in 2 files
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Mon, 1 Sep 2014 20:20:05 +0000 (22:20 +0200)]
lavd/v4l2: introduce enqueue_buffer()
Additionally, make sure a buffer gets enqueued again (even in error paths) after
it has been succesfully dequeued.
Tested-by: Dmitry Volyntsev <xeioexception@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Thu, 4 Sep 2014 19:16:13 +0000 (21:16 +0200)]
avformat/srtdec: speed up probing
wm4 [Tue, 2 Sep 2014 18:54:16 +0000 (20:54 +0200)]
avformat/realtextdec: UTF-16 support
Also remove ff_smil_extract_next_chunk - this was the last user of it.
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>