]>
git.sesse.net Git - ffmpeg/log
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)]
Michael Niedermayer [Sat, 25 Oct 2014 02:45:23 +0000 (04:45 +0200)]
Merge commit '
28c020d4df9b060a58a124a7a5406d4313fbe249 '
* commit '
28c020d4df9b060a58a124a7a5406d4313fbe249 ':
matroskaenc: check avio_open_dyn_buf return value
Conflicts:
libavformat/matroskaenc.c
See:
b1f517f503139ab9d0c406228b53663e86a128df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 02:37:27 +0000 (04:37 +0200)]
Merge commit '
e0caa1eb4e518111a81801db0d2ccdd2733ba94b '
* commit '
e0caa1eb4e518111a81801db0d2ccdd2733ba94b ':
matroskadec: check return values
Conflicts:
libavformat/matroskadec.c
See:
1116491c53156dd1972eca3e65d5a3b8529c4658
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 02:31:44 +0000 (04:31 +0200)]
Merge commit '
3c1199c3c4cbdb4ffff0de89f06d5a08acefe356 '
* commit '
3c1199c3c4cbdb4ffff0de89f06d5a08acefe356 ':
matroskadec: fix leak on error
Conflicts:
libavformat/matroskadec.c
See:
2fe4b6210c4b56ecfe4668c78611a8a679303511
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 02:24:16 +0000 (04:24 +0200)]
Merge commit '
7785ce1c769369abf85b276148548a5510aabb5f '
* commit '
7785ce1c769369abf85b276148548a5510aabb5f ':
lavf: replace rename() with ff_rename()
Conflicts:
libavformat/hdsenc.c
libavformat/internal.h
See:
95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 01:44:17 +0000 (03:44 +0200)]
Merge commit '
0b66fb4505e0bb43de3797f63f3290f0188d67cc '
* commit '
0b66fb4505e0bb43de3797f63f3290f0188d67cc ':
flac_picture: prevent a possible out of bound write
This is only partly merged, the condition this checks for
is impossible to be true as it would imply avio_read() to
read more than the size passed to it
See:
731f7eaaade4c0cf91f8008cc30c0342caa64df1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 01:37:21 +0000 (03:37 +0200)]
Merge commit '
f1ed83e23add1c26c50b146727e4c2399dfc0b3a '
* commit '
f1ed83e23add1c26c50b146727e4c2399dfc0b3a ':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See:
3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 01:27:13 +0000 (03:27 +0200)]
Merge commit '
1967cd4e4c1cd96dfa195ce14e4b212ddb70586d '
* commit '
1967cd4e4c1cd96dfa195ce14e4b212ddb70586d ':
audiointerleave: check av_new_packet return value
Conflicts:
libavformat/audiointerleave.c
See:
3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Oct 2014 01:08:19 +0000 (03:08 +0200)]
Merge commit '
ac84c1ce24a285f9cf16d4297bce73b1c4a6e435 '
* commit '
ac84c1ce24a285f9cf16d4297bce73b1c4a6e435 ':
avfilter: check filter link validity
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 20 Oct 2014 13:11:25 +0000 (14:11 +0100)]
mov: fix assigment check
CC: libav-stable@libav.org
Bug-Id: CID
1197050
Tomas Härdin [Thu, 23 Oct 2014 23:05:59 +0000 (00:05 +0100)]
mxfenc: Fix possible integer overflows
None of these are likely unless the user is writing a file with two billion
streams or a duration of around two months.
CC: libav-stable@libav.org
Bug-Id: CID 700568 / CID 700569 / CID 700570 /
CID 700571 / CID 700572 / CID 700573
Vittorio Giovara [Thu, 23 Oct 2014 23:05:57 +0000 (00:05 +0100)]
mxfdec: add missing break
CC: libav-stable@libav.org
Bug-Id: CID 732232
Vittorio Giovara [Thu, 23 Oct 2014 23:05:55 +0000 (00:05 +0100)]
matroskaenc: check avio_open_dyn_buf return value
CC: libav-stable@libav.org
Bug-Id: CID 703629
Vittorio Giovara [Thu, 23 Oct 2014 23:05:53 +0000 (00:05 +0100)]
matroskadec: check return values
CC: libav-stable@libav.org
Bug-Id: CID 733712
Vittorio Giovara [Thu, 23 Oct 2014 23:05:52 +0000 (00:05 +0100)]
matroskadec: fix leak on error
CC: libav-stable@libav.org
Bug-Id: CID
1026767
Luca Barbato [Sun, 19 Oct 2014 22:48:49 +0000 (00:48 +0200)]
lavf: replace rename() with ff_rename()
The new function wraps errno so that its value is correctly reported
when other functions overwrite it (eg. in case of logging).
CC: libav-stable@libav.org
Bug-Id: CID
1135748
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Mon, 20 Oct 2014 13:11:21 +0000 (14:11 +0100)]
flac_picture: prevent a possible out of bound write
At "mimetype[len] = 0;" mimetype is a 64 element array and len might be
equal to or greater than that.
CC: libav-stable@libav.org
Bug-Id: CID
1061055
Vittorio Giovara [Mon, 20 Oct 2014 13:11:15 +0000 (14:11 +0100)]
img2dec: check av_new_packet return value
CC: libav-stable@libav.org
Bug-Id: CID
1087077
Vittorio Giovara [Mon, 20 Oct 2014 13:11:14 +0000 (14:11 +0100)]
audiointerleave: check av_new_packet return value
CC: libav-stable@libav.org
Bug-Id: CID
1087078
Vittorio Giovara [Mon, 20 Oct 2014 13:11:13 +0000 (14:11 +0100)]
avfilter: check filter link validity
Remove now redundant check.
CC: libav-stable@libav.org
Bug-Id: CID 700371
Michael Niedermayer [Fri, 24 Oct 2014 22:22:04 +0000 (00:22 +0200)]
Changelog: add entry for libutvideo 422P10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Oct 2014 12:34:09 +0000 (14:34 +0200)]
avcodec/libutvideodec: Support YUV422P10
Based on ConvertToPlanar() from libutvideo
libutvideo sadly does not seem to support exporting its internal planar buffers
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Eric Zimmerman [Thu, 9 Oct 2014 17:12:44 +0000 (10:12 -0700)]
Added support for G2M5 codec
This has also been independently found and fixed similarly by carl in
f4a3bbf4a3cd375121ea2495817f3e50e831ed48
The 2nd magic check is taken from carls implementation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 17:23:23 +0000 (19:23 +0200)]
avformat: Add and use ff_copy_whitelists()
Fixes potential security issue in case of running out of memory
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 24 Oct 2014 10:31:45 +0000 (12:31 +0200)]
avcodec/aacdec: warn user when remapping streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 16:06:26 +0000 (18:06 +0200)]
avformat/mp3dec: also accept Lavc as shortname to read delays
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 13:47:33 +0000 (15:47 +0200)]
avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 12:48:12 +0000 (14:48 +0200)]
Merge commit '
ef363ebd596da18f889a7d4845023a23dfac84c9 '
* commit '
ef363ebd596da18f889a7d4845023a23dfac84c9 ':
mp3enc: write full LAME frame
Conflicts:
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 11:04:34 +0000 (13:04 +0200)]
Merge commit '
88b32673db39440422a73ec3047d3326c96b4fb2 '
* commit '
88b32673db39440422a73ec3047d3326c96b4fb2 ':
avconv: copy stream-level side data when streamcopying
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 10:58:22 +0000 (12:58 +0200)]
Merge commit '
c63418e0a3afbcdbc59fd65c270d45efafe092ce '
* commit '
c63418e0a3afbcdbc59fd65c270d45efafe092ce ':
doc: reword the mp3 muxer documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 10:49:53 +0000 (12:49 +0200)]
Merge commit '
99143140dea12363af680d02e23cb42cfe191679 '
* commit '
99143140dea12363af680d02e23cb42cfe191679 ':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See:
19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 10:40:08 +0000 (12:40 +0200)]
Merge commit '
6df9d9b55d3f56ee7782639a7678eeeaf77f14ea '
* commit '
6df9d9b55d3f56ee7782639a7678eeeaf77f14ea ':
lavf: Use av_gettime_relative
Conflicts:
libavformat/hls.c
See:
f78bc96b7c1c74caf99a7139cf81ce1110404965
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 10:30:10 +0000 (12:30 +0200)]
Merge commit '
d0c093021943e9b9c23528b12cd61ca2a5b01b4f '
* commit '
d0c093021943e9b9c23528b12cd61ca2a5b01b4f ':
avconv: Use av_gettime_relative
Conflicts:
ffmpeg.c
See:
76191c08f88fd66cf9198afc0c4a809c4c0336d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 10:16:09 +0000 (12:16 +0200)]
Merge commit '
248d8fb60c59c8e044d9c8f78f23383b7cdecf72 '
* commit '
248d8fb60c59c8e044d9c8f78f23383b7cdecf72 ':
avplay: Use av_gettime_relative
Conflicts:
ffplay.c
See:
0ca0b4c29cf750cbb15732cddbe16723a66afda8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Oct 2014 09:57:10 +0000 (11:57 +0200)]
Michael Niedermayer [Fri, 24 Oct 2014 09:41:02 +0000 (11:41 +0200)]
Michael Niedermayer [Fri, 24 Oct 2014 09:04:52 +0000 (11:04 +0200)]
Merge commit '
1bd0bdcdc236099d5c0d179696951f35f5310fa5 '
* commit '
1bd0bdcdc236099d5c0d179696951f35f5310fa5 ':
lavu: Add av_gettime_relative
Conflicts:
libavutil/time.c
libavutil/time.h
libavutil/version.h
See:
0eec06ed8747923faa6a98e474f224d922dc487d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 12 Apr 2014 13:20:57 +0000 (15:20 +0200)]
mp3enc: write full LAME frame
Most importantly, it contains the encoder delay and replaygain info.
Anton Khirnov [Sat, 18 Oct 2014 16:19:55 +0000 (18:19 +0200)]
avconv: copy stream-level side data when streamcopying
Anton Khirnov [Sat, 12 Apr 2014 13:20:01 +0000 (15:20 +0200)]
doc: reword the mp3 muxer documentation
Make it more structured.
Anton Khirnov [Sat, 18 Oct 2014 14:25:16 +0000 (16:25 +0200)]
mp3dec: fix reading the Xing tag
The quality scale field is only supposed to be present if the fourth bit
is set. In practice, lame always sets it, but other tools might not.
CC:libav-stable@libav.org
Martin Storsjö [Wed, 22 Oct 2014 09:40:46 +0000 (12:40 +0300)]
lavf: Use av_gettime_relative
The ones left using av_gettime are NTP timestamps (for RTCP,
which is specified to send the actual current realtime clock
in RTCP SR packets), and the NUT muxer timestamper, which is
documented as using wallclock time.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 22 Oct 2014 09:25:23 +0000 (12:25 +0300)]
avconv: Use av_gettime_relative
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 22 Oct 2014 09:23:08 +0000 (12:23 +0300)]
avplay: Use av_gettime_relative
Signed-off-by: Martin Storsjö <martin@martin.st>
Olivier Langlois [Tue, 6 May 2014 21:16:50 +0000 (17:16 -0400)]
tools: Use av_gettime_relative
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Martin Storsjö <martin@martin.st>
Olivier Langlois [Tue, 6 May 2014 21:16:49 +0000 (17:16 -0400)]
lavc: Use av_gettime_relative
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 22 Oct 2014 09:14:37 +0000 (12:14 +0300)]
lavu: Add av_gettime_relative
Since av_gettime() is used in a number of places where actual
real time clock is required, the monotonic clock introduced in
ebef9f5a5 would have consequences that are hard to handle. Instead
split it into a separate function that can be used in the cases
where only relative time is desired.
On platform where no monotonic clock is available, the difference
between the two av_gettime functions is not clear, and one could
mistakenly use the relative clock where an absolute one is
required. Therefore add an offset, to make it evident that the
time returned from av_gettime_relative never is actual current
real time, even though it is based on av_gettime.
Based on a patch by Olivier Langlois.
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Utkin [Thu, 23 Oct 2014 16:55:45 +0000 (20:55 +0400)]
avformat/rtsp: pass return code from ffurl_open() on its failure
Previously, AVERROR(EIO) was returned. Now the value is passed from
lower level, thus it is possible to distinguish ECONNREFUSED, ETIMEDOUT,
ENETUNREACH etc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 Oct 2014 21:48:45 +0000 (23:48 +0200)]
avformat/rtsp: add av_assert0() to clarify that the else case is supposed to be unreachable
If its reachable then theres a bug as err would be uninitialized
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 Oct 2014 21:32:32 +0000 (23:32 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Print an error if -r and -vsync 0 are used together.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 23 Oct 2014 21:09:01 +0000 (23:09 +0200)]
avcodec/utils: Print the codec name that is missing on the whitelist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 23 Oct 2014 21:27:46 +0000 (23:27 +0200)]
Print an error if -r and -vsync 0 are used together.
Fixes ticket #4041.
Michael Niedermayer [Thu, 23 Oct 2014 21:02:48 +0000 (23:02 +0200)]
avcodec/options_table: Fix codec_whitelist flags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Thu, 23 Oct 2014 16:55:46 +0000 (20:55 +0400)]
avformat/http: pass return code from http_open_cnx_internal() on its failure
Previously, AVERROR(EIO) was returned on failure of
http_open_cnx_internal(). Now the value is passed to upper level, thus
it is possible to distinguish ECONNREFUSED, ETIMEDOUT, ENETUNREACH etc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>