]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 29 Oct 2014 19:49:25 +0000 (20:49 +0100)]
Michael Niedermayer [Wed, 29 Oct 2014 19:43:33 +0000 (20:43 +0100)]
Merge commit '
a9179b5bd6f143b4a7ff48bb0d00c8f0a7cafb4b '
* commit '
a9179b5bd6f143b4a7ff48bb0d00c8f0a7cafb4b ':
configure: Check only for xcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Mundt [Wed, 29 Oct 2014 13:04:48 +0000 (13:04 +0000)]
avformat/utils: support more AVC Intra formats without SPS/PPS header
add support for AVC Intra 50 720p and 1080p without SPS/PPS header in mxf and mov demuxers. I got the SPS/PPS tables from libbmx.
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Oct 2014 16:57:18 +0000 (17:57 +0100)]
avformat/mpjpeg: make boundary tag user customizable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Wed, 29 Oct 2014 17:29:43 +0000 (18:29 +0100)]
avformat/subtitles: reduce log level of UTF-16 warning
Applications can use this to silence the message.
James Almer [Tue, 28 Oct 2014 01:48:08 +0000 (22:48 -0300)]
lavu/atomic: add support for the new memory model aware gcc built-ins
__sync built-ins are considered legacy and will be deprecated.
These new memory model aware built-ins have been available since GCC 4.7.0
Use them by default when available except for __atomic_compare_exchange_n(),
which is slower, and is instead implemented as a fallback for when and if gcc
removes the legacy __sync built-ins.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 24 Oct 2014 12:15:37 +0000 (13:15 +0100)]
oggenc: remove unneeded null check
The code would have segfaulted before if oggstream were NULL.
CC: libav-stable@libav.org
Bug-Id: CID 732218
James Almer [Tue, 21 Oct 2014 06:56:06 +0000 (03:56 -0300)]
lavd/v4l2: don't use avpriv_ prefix for internal functions
No need to keep the old symbols around until a major bump since lavd functions
with the avpriv_ prefix were never exposed.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Oct 2014 13:15:29 +0000 (14:15 +0100)]
avcodec/utils: Align dimensions by at least their chroma sub-sampling factors.
Fixes: out of array accesses
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Oct 2014 12:15:26 +0000 (13:15 +0100)]
avcodec/libutvideodec: Try to fix build failure with old libutvideo
Found-by: Jan Ehrhardt <phpdev@ehrhardt.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Mundt [Tue, 28 Oct 2014 22:38:22 +0000 (22:38 +0000)]
avformat/mxfenc: AVC Intra support
To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra.
This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header.
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 29 Oct 2014 09:17:37 +0000 (10:17 +0100)]
Improve the fieldmatch documentation about mixed telecined content.
The fieldmatch filter has no problem with mixed telecined and
progressive content but the decimate filter does not detect the
changing framerate and drops progressive frames.
Michael Niedermayer [Wed, 29 Oct 2014 02:54:06 +0000 (03:54 +0100)]
avformat/mxfdec: fix null pointer dereference
Fixes: signal_sigsegv_b5b3d4_2_001.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 29 Oct 2014 01:01:10 +0000 (02:01 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Mention in the documentation that fieldmatch needs cfr input.
Use v4l2 input format automatically if filename starts with "/dev/video"
Print a warning if a subtitle demuxer changes utf16 to utf8.
Do not set the lame quality if the user didn't request it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 29 Oct 2014 00:59:52 +0000 (01:59 +0100)]
Mention in the documentation that fieldmatch needs cfr input.
This can be improved in the decimate filter but for the moment
explicitely mentioning that mixed telecined and progressive
content is unsupported is an improvement.
Fixes ticket #3968.
Andrey Utkin [Wed, 29 Oct 2014 00:59:25 +0000 (01:59 +0100)]
Use v4l2 input format automatically if filename starts with "/dev/video"
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Wed, 29 Oct 2014 00:32:44 +0000 (01:32 +0100)]
Print a warning if a subtitle demuxer changes utf16 to utf8.
This does not fix anything but gives users a chance to
know that they must not pass -sub_charenc UTF-16 to ffmpeg.
Fixes ticket #4059.
Carl Eugen Hoyos [Wed, 29 Oct 2014 00:31:06 +0000 (01:31 +0100)]
Do not set the lame quality if the user didn't request it.
This makes FFmpeg's mp3 output more similar to lame's output.
Michael Niedermayer [Tue, 28 Oct 2014 23:57:07 +0000 (00:57 +0100)]
avcodec/dnxhddec: treat pix_fmt like width/height
Fixes out of array accesses
Fixes: asan_heap-oob_22c9a39_16_015.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Tue, 28 Oct 2014 13:36:27 +0000 (14:36 +0100)]
mxfdec: Tighten RIP length bounds in mxf_read_random_index_pack()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Tue, 28 Oct 2014 13:27:06 +0000 (14:27 +0100)]
mxfdec: Merge last_partition and footer_partition
FooterPartition offset specified in RIP takes precedence over any value written
in PartitionPacks. This fixes the same issue
f06f6da tries to fix without
introducing an extra variable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Tue, 28 Oct 2014 12:33:47 +0000 (13:33 +0100)]
Revert "avformat/mxfdec: detect loops during header parsing"
This reverts commit
1c010fd035c1a14dc73827b84f21f593e969a5d6 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Tue, 28 Oct 2014 12:38:18 +0000 (13:38 +0100)]
mxfdec: Parse PreviousPartition in mxf_seek_to_previous_partition()
Without this patch the demuxer can get stuck in a loop if PreviousPartition
points somewhere where there's no PartitionPack, or if klv_read_packet() syncs
back up to the current partition.
This should fix Ticket3278 properly and unbreak Ticket4040.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Tue, 28 Oct 2014 12:33:04 +0000 (13:33 +0100)]
mxfdec: Break out parts of mxf_read_header() into separate functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 15:59:50 +0000 (16:59 +0100)]
avformat/mvdec: Check size in read_table() for validity
This check is redundant with the previous commit but it provides
better error messages and feedback while the previous commit
ensures that var_read_string() doesnt return uninitialized arrays
if it itself is feeded with an invalid size possibly through a
different future codepath.
Fixes: asan_heap-oob_49b1e5_12_011.movie
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 15:42:05 +0000 (16:42 +0100)]
avformat/mvdec: Check size for validity in var_read_string()
Fixes out of array read
Fixes: asan_heap-oob_49b1e5_12_011.movie
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 14:26:42 +0000 (15:26 +0100)]
avcodec/dxa: check dimensions
Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 28 Oct 2014 09:43:52 +0000 (10:43 +0100)]
configure: Check only for xcb
xcb-utils are not needed anymore.
Christophe Gisquet [Wed, 15 Oct 2014 16:37:34 +0000 (18:37 +0200)]
dvenc: mark encoder as intra
And thus allow various multithreading.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 14 Oct 2014 00:02:36 +0000 (02:02 +0200)]
dv: increase VLC reading bits to 10
This also requires a bump in the table size of bit patterns to 1664.
From 356 to 348 cycles.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 11:07:20 +0000 (12:07 +0100)]
avdevice/xcbgrab: set avclass category
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 10:16:17 +0000 (11:16 +0100)]
Merge commit '
4ad1eba011860224831ce0bb3123f6f55716b68a '
* commit '
4ad1eba011860224831ce0bb3123f6f55716b68a ':
lavd: fix building x11grab after
a6674d2
no change as the buggy line was not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 10:04:51 +0000 (11:04 +0100)]
Merge commit '
ce91b2eae6ea52fc1a7003566d26db20ca62d745 '
* commit '
ce91b2eae6ea52fc1a7003566d26db20ca62d745 ':
vdpau: return MAIN instead of BASELINE for H.264 CBP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 09:58:03 +0000 (10:58 +0100)]
Merge commit '
26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893 '
* commit '
26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893 ':
vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 28 Oct 2014 06:22:00 +0000 (07:22 +0100)]
lavd: fix building x11grab after
a6674d2
Rémi Denis-Courmont [Sun, 26 Oct 2014 19:33:58 +0000 (21:33 +0200)]
vdpau: return MAIN instead of BASELINE for H.264 CBP
This is the same as the previous change, but for applications using the
old API (such as VLC 2.2).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Sun, 26 Oct 2014 19:24:12 +0000 (21:24 +0200)]
vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP
The H.264 Constrained Baseline Profile (CBP) is a subset of both the
Main Profile and the Baseline Profile. In principles, a hardware
decoder that supports either of those can decode CBP content. As it
happens, Main is supported by all VDPAU drivers, and Baseline is not.
So favor map CBP to MP for now. Hopefully in the future libvdpau will
offer an explicit choice for CBP.
This fixes bug 757.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Tue, 28 Oct 2014 01:14:41 +0000 (02:14 +0100)]
avcodec/dirac_arith: fix integer overflow
Fixes: asan_heap-oob_1078676_9_008.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 00:23:40 +0000 (01:23 +0100)]
avcodec/diracdec: Tighter checks on CODEBLOCKS_X/Y
Fixes very long but finite loop
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Oct 2014 00:23:40 +0000 (01:23 +0100)]
avcodec/diracdec: Use 64bit in calculation of codeblock coordinates
Fixes integer overflow
Fixes out of array read
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 22:33:39 +0000 (23:33 +0100)]
Merge commit '
11467ecf519788f2e2f49c63a17eb600e618489e '
* commit '
11467ecf519788f2e2f49c63a17eb600e618489e ':
mxfdec: reduce loop bound in mxf_read_pixel_layout()
See:
187630b2449f1eae1096f81f31bab7d81bed3cf1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 22:20:21 +0000 (23:20 +0100)]
avformat/bethsoftvid: print error in case the side date failed to be allocated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 22:08:50 +0000 (23:08 +0100)]
Merge commit '
e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600 '
* commit '
e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600 ':
bethsoftvid: check return value and clean memory
Conflicts:
libavformat/bethsoftvid.c
See:
3632f35c8e163f6aa6d63c317e3e1fca6a4a5fab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 21:56:04 +0000 (22:56 +0100)]
avformat/filmstripdec: Fix several integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 21:25:37 +0000 (22:25 +0100)]
Merge commit '
b46b233baffc2076a1a17a264ba9553ae0d4878f '
* commit '
b46b233baffc2076a1a17a264ba9553ae0d4878f ':
filmstripdec: avoid integer overflow
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 21:18:03 +0000 (22:18 +0100)]
Merge commit '
090c67d586e3916f9acc49e010b6389d07f97153 '
* commit '
090c67d586e3916f9acc49e010b6389d07f97153 ':
matroskaenc: write correct Display{Width, Height} in stereo encoding
Conflicts:
libavformat/matroskaenc.c
See:
6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 20:26:51 +0000 (21:26 +0100)]
Merge commit '
a6674d2e7771dbf7a4a5556f5e126be83cadac96 '
* commit '
a6674d2e7771dbf7a4a5556f5e126be83cadac96 ':
xcbgrab: XCB-based screen capture
Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 19:48:58 +0000 (20:48 +0100)]
avcodec/sgidec: fix count check
Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 19:48:58 +0000 (20:48 +0100)]
avcodec/sgidec: fix linesize for 16bit
Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Mon, 27 Oct 2014 12:59:48 +0000 (13:59 +0100)]
mxfdec: reduce loop bound in mxf_read_pixel_layout()
Makes coverity less confused and code more readable.
Bug-Id: CID 732262
Vittorio Giovara [Fri, 24 Oct 2014 12:15:34 +0000 (13:15 +0100)]
bethsoftvid: check return value and clean memory
CC: libav-stable@libav.org
Bug-Id: CID 733777
Vittorio Giovara [Fri, 24 Oct 2014 12:15:39 +0000 (13:15 +0100)]
filmstripdec: avoid integer overflow
CC: libav-stable@libav.org
Bug-Id: CID 732246
Vittorio Giovara [Wed, 22 Oct 2014 13:36:32 +0000 (14:36 +0100)]
matroskaenc: write correct Display{Width, Height} in stereo encoding
should be the raw amount of pixels (for example 3840x1080 for full HD side by
side) and the DisplayWidth/Height in pixels should be the amount of pixels for
one plane (1920x1080 for that full HD stream)."
So, move the aspect ratio check in the mkv_write_stereo_mode() function
and always write the embl when stereo format and/or aspect ration is set.
Also add a few comments to that function.
CC: libav-stable@libav.org
Found-by: Asan Usipov <asan.usipov@gmail.com>
Thilo Borgmann [Mon, 27 Oct 2014 14:20:27 +0000 (15:20 +0100)]
lavd/avfoundation: Fix compilation for non MAC OS devices by conditional compilation of screen capture capabilities.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 13:03:09 +0000 (14:03 +0100)]
avcodec/hevc_ps: Check default display window bitstream and skip if invalid
Fixes Ticket4035
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 03:30:11 +0000 (04:30 +0100)]
avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c
Fixes Ticket4011
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 03:24:20 +0000 (04:24 +0100)]
avcodec/h264: simplify find_start_code()
this also uses avpriv_find_start_code(), though no speed change is expected as
the area searched is generally small
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Oct 2014 03:22:42 +0000 (04:22 +0100)]
Move get_avc_nalsize() and find_start_code() to h264.h
This allows sharing them with the h264 parser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
avformat/mpegts: Add support for Opus in MPEG-TS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
avcodec: Add support for Opus in MPEG-TS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 25 Oct 2014 11:19:25 +0000 (11:19 +0000)]
dv: move inverse weight tables to decoder
The encoder has its own tables and does not access the idct_factor
member of the DVVideoContext structure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 25 Oct 2014 11:19:23 +0000 (11:19 +0000)]
dv: fix weight table for 2x4x8 transform
The coefficients must be in the appropriate zigzag scan order.
Also fix their values at the same time, as they were pretty wrong.
Fixes ticket #2970.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Oliver [Sun, 26 Oct 2014 14:43:15 +0000 (01:43 +1100)]
avutil/intmath: enable builtin intrinsics for icl and msvc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 14:52:12 +0000 (15:52 +0100)]
ffmpeg_opt: Check the return code from strftime()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 14:51:58 +0000 (15:51 +0100)]
avformat/matroskadec: Check the return code from strftime()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 14:51:37 +0000 (15:51 +0100)]
avformat/mlvdec: Check the return code from strftime()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 24 Aug 2014 12:18:22 +0000 (14:18 +0200)]
xcbgrab: XCB-based screen capture
Matches the x11grab screen capture by features.
Michael Niedermayer [Sun, 26 Oct 2014 02:22:28 +0000 (03:22 +0100)]
Merge commit '
ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8 '
* commit '
ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8 ':
lavf: Implement ff_brktimegm using gmtime_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 02:12:37 +0000 (03:12 +0100)]
Merge commit '
6b9b42cc5576e1819ad1e29d98940066fd14b2d6 '
* commit '
6b9b42cc5576e1819ad1e29d98940066fd14b2d6 ':
drawtext: Remove the ifdef for localtime_r
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 01:38:26 +0000 (02:38 +0100)]
Merge commit '
82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de '
* commit '
82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de ':
Use gmtime_r instead of gmtime and localtime_r instead of localtime
Conflicts:
libavformat/mov.c
libavformat/mxfenc.c
libavformat/wtvdec.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 01:26:45 +0000 (02:26 +0100)]
Merge commit '
3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e '
* commit '
3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e ':
lavu: Provide fallbacks for gmtime_r and localtime_r
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 01:06:40 +0000 (02:06 +0100)]
Merge commit '
9dcf2397219ca796f0fafce2a703770d6fd09920 '
* commit '
9dcf2397219ca796f0fafce2a703770d6fd09920 ':
lavf: Check the return value of strftime
Conflicts:
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Oct 2014 00:21:42 +0000 (02:21 +0200)]
Merge commit '
851ace79a307bea54b44bd6f7ecd3b7861c28ec6 '
* commit '
851ace79a307bea54b44bd6f7ecd3b7861c28ec6 ':
wtv: Avoid needlessly calling gmtime twice with the same argument
Conflicts:
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Sat, 25 Oct 2014 00:31:24 +0000 (17:31 -0700)]
libavformat/mxfdec: read source timecode from pulldown component
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 24 Oct 2014 08:08:28 +0000 (11:08 +0300)]
lavf: Implement ff_brktimegm using gmtime_r
While a standalone implementation is nice, we already depend on
gmtime and gmtime_r in a number of places.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 24 Oct 2014 07:59:34 +0000 (10:59 +0300)]
drawtext: Remove the ifdef for localtime_r
If it isn't available in the system, we've got a fallback to
the normal localtime function, so normal code can assume it is
available as long as time_internal.h is included.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 24 Oct 2014 07:46:36 +0000 (10:46 +0300)]
Use gmtime_r instead of gmtime and localtime_r instead of localtime
gmtime isn't thread safe in general. In msvcrt (which lacks gmtime_r),
the buffer used by gmtime is thread specific though.
One call to localtime is left in avconv_opt.c, where thread safety
shouldn't matter (instead of making avconv depend on the libavutil
internal header).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 24 Oct 2014 07:33:19 +0000 (10:33 +0300)]
lavu: Provide fallbacks for gmtime_r and localtime_r
This allows writing most code as if they always are is available.
These are ok to use from other libraries even though it's not a
public header, since they only provide an inline declaration, and
doesn't add an actual dependency on lavu internals. (This can be
considered more a build system compatibility fallback than a
libavutil feature.)
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 24 Oct 2014 07:43:20 +0000 (10:43 +0300)]
lavf: Check the return value of strftime
If the buffer provided to strftime is too small, the buffer contents
are indeterminate - it does not guarantee actually null terminating
the buffer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 24 Oct 2014 07:36:54 +0000 (10:36 +0300)]
wtv: Avoid needlessly calling gmtime twice with the same argument
Signed-off-by: Martin Storsjö <martin@martin.st>
Thilo Borgmann [Sat, 25 Oct 2014 15:02:28 +0000 (17:02 +0200)]
lavd/avfoundation: Add support for screen capturing.
Patch based on pull-request by Joseph Benden <joe@benden.us>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 Oct 2014 22:23:52 +0000 (00:23 +0200)]
avformat/rdt: Forward whitelists to rdt demuxer
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Wed, 6 Aug 2014 22:45:26 +0000 (00:45 +0200)]
opts: add list device sources/sinks options
Allows to list sources/sinks of the devices that implement
that functionality.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Fri, 24 Oct 2014 21:31:03 +0000 (23:31 +0200)]
doc/fftools-common-opts: document -devices option
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Christophe Gisquet [Sat, 25 Oct 2014 11:19:22 +0000 (11:19 +0000)]
dv: more precise weight table for 8x8
It is derived from the actual equations of the specs. In
particular, it is closer to the inverse of what the encoder uses.
fate tests accordingly updated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 25 Oct 2014 11:19:21 +0000 (11:19 +0000)]
dv: use smaller type for weight tables
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 25 Oct 2014 11:19:20 +0000 (11:19 +0000)]
dv: better split weight tables assignment
This is a mostly cosmetical patch in preparation for the following.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 14:28:41 +0000 (16:28 +0200)]
avformat/mpeg: Use av_find_input_format() instead of directly linking to the demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 14:28:03 +0000 (16:28 +0200)]
avformat/rtpdec_asf: Use av_find_input_format() instead of directly linking to the demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 14:12:16 +0000 (16:12 +0200)]
tools/ffhash: read errno before calling functions which might change it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:48:56 +0000 (13:48 +0200)]
avformat: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:20:23 +0000 (13:20 +0200)]
avformat/hdsenc: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:19:41 +0000 (13:19 +0200)]
avfilter: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:19:10 +0000 (13:19 +0200)]
avdeviece: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:18:47 +0000 (13:18 +0200)]
avcodec: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:17:26 +0000 (13:17 +0200)]
cmdutils: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 11:04:18 +0000 (13:04 +0200)]
avformat: Print error message on failure of ff_rename()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 02:57:05 +0000 (04:57 +0200)]
Merge commit '
50dbe6b3544fa64d5611e16553bf542fd71276b8 '
* commit '
50dbe6b3544fa64d5611e16553bf542fd71276b8 ':
mov: fix assigment check
Conflicts:
libavformat/mov.c
See:
af2e5061bbcabf5eae780929fa25784b6127759e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 02:55:17 +0000 (04:55 +0200)]
Merge commit '
7df3b426bbfbd7efd9a0f56393e3cc78413b0869 '
* commit '
7df3b426bbfbd7efd9a0f56393e3cc78413b0869 ':
mxfenc: Fix possible integer overflows
Conflicts:
libavformat/mxfenc.c
See:
e3ba817b95bbdc7c8aaf83b4a6804d1b49eb4de4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 02:51:44 +0000 (04:51 +0200)]