]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 3 Aug 2013 07:22:24 +0000 (09:22 +0200)]
Merge commit '
79be2c325c5ee8f7ac9e28399e51986ebe99bb3c '
* commit '
79be2c325c5ee8f7ac9e28399e51986ebe99bb3c ':
doc/print_options: Move options headers to a saner place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 07:16:36 +0000 (09:16 +0200)]
Merge commit '
b5a138652ff8a5b987d3e1191e67fd9f6575527e '
* commit '
b5a138652ff8a5b987d3e1191e67fd9f6575527e ':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 07:01:48 +0000 (09:01 +0200)]
Merge commit '
0d6fa3977b016f1b72b0b24b8834ff9222498548 '
* commit '
0d6fa3977b016f1b72b0b24b8834ff9222498548 ':
rtmp: Add seek support
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 3 Aug 2013 06:54:54 +0000 (08:54 +0200)]
Merge commit '
0d8b943d204bd16fcf2f4a59c742e65a401dd3d0 '
* commit '
0d8b943d204bd16fcf2f4a59c742e65a401dd3d0 ':
h264_sei: Return meaningful values
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 22:45:02 +0000 (00:45 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Forward interlaced field information from mov to ffv1 decoder.
Do not suggest to use gas-preprocessor if using it would break compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tim.Nicholson [Fri, 2 Aug 2013 21:31:40 +0000 (23:31 +0200)]
Forward interlaced field information from mov to ffv1 decoder.
Only read the information for old ffv1, level/version 3 saves
the information in the bitstream.
Fixes a part of ticket #2190.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Fri, 2 Aug 2013 21:23:58 +0000 (23:23 +0200)]
Do not suggest to use gas-preprocessor if using it would break compilation.
gas-preprocessor does not work on ppc with pic and on ppc64.
Michael Niedermayer [Fri, 2 Aug 2013 21:12:26 +0000 (23:12 +0200)]
avcodec/mdec: make block_index static const
Michael Niedermayer [Fri, 2 Aug 2013 21:11:58 +0000 (23:11 +0200)]
avcodec/mjpeg: make 2 outcommented tables static
Michael Niedermayer [Fri, 2 Aug 2013 21:11:31 +0000 (23:11 +0200)]
avcodec/dxtory: make def_lru[8] static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 21:10:42 +0000 (23:10 +0200)]
avcodec/dnxhdenc: make header_prefix static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 19:14:25 +0000 (21:14 +0200)]
avformat/matroskaenc: make 2 tables static that are not used outside matroskaenc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 19:09:54 +0000 (21:09 +0200)]
movenc: make uuids static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 1 Aug 2013 12:41:34 +0000 (14:41 +0200)]
doc/print_options: Move options headers to a saner place
Diego Biurrun [Thu, 1 Aug 2013 12:35:01 +0000 (14:35 +0200)]
Give less generic names to global library option arrays
Gavriloaie Eugen-Andrei [Fri, 2 Aug 2013 09:29:23 +0000 (12:29 +0300)]
rtmp: Add seek support
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Fri, 2 Aug 2013 16:45:58 +0000 (16:45 +0000)]
ttaenc: fix packet size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vittorio Giovara [Fri, 2 Aug 2013 08:33:00 +0000 (10:33 +0200)]
h264_sei: Return meaningful values
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 2 Aug 2013 14:59:03 +0000 (16:59 +0200)]
avdevice/timefilter-test: dont try to optimize par1 for n0=0 case
for the n0=0 case there are multiple solutions and different
platforms pick different ones
This should reduce the issues with fate and the timefilter test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 11:05:16 +0000 (13:05 +0200)]
flvdec: silence unused warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:37:37 +0000 (12:37 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264_sei: K&R formatting cosmetics
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:23:47 +0000 (12:23 +0200)]
Merge commit '
4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c '
* commit '
4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c ':
h264_sei: Remove pointless old comment
twinvq: Add proper twinvq prefixes to identifiers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:18:48 +0000 (12:18 +0200)]
Merge commit '
f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5 '
* commit '
f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5 ':
flvdec: Eliminate completely silly goto
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 10:07:20 +0000 (12:07 +0200)]
Merge commit '
e4529df944616917ae8462f5102253ff7f983093 '
* commit '
e4529df944616917ae8462f5102253ff7f983093 ':
flvdec: K&R formatting cosmetics
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 08:45:10 +0000 (10:45 +0200)]
Merge commit '
390b4d7088b5cecace245fee0c54a57e24dabdf4 '
* commit '
390b4d7088b5cecace245fee0c54a57e24dabdf4 ':
flvdec: Fix = vs. == typo in sample rate check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 08:39:37 +0000 (10:39 +0200)]
Merge commit '
fd8f91e3f44a2bdbefaaebead388133c5fdd3423 '
* commit '
fd8f91e3f44a2bdbefaaebead388133c5fdd3423 ':
rtsp: Simplify code for forming the remote peer url
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Jul 2013 19:59:01 +0000 (21:59 +0200)]
jpeg2000dec: simplify jpeg2000_read_bitstream_packets()
23 lines less
less error prone as theres no more need to update *_size on every read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Aug 2013 01:45:02 +0000 (03:45 +0200)]
avcodec/wmaenc: change commented assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 27 Jul 2013 19:14:45 +0000 (21:14 +0200)]
mpegts: save last pcr of pcr pids in PES Context
Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 31 Jul 2013 02:41:32 +0000 (19:41 -0700)]
libxvid: cosmetics: Realign the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 1 Aug 2013 19:14:48 +0000 (21:14 +0200)]
ffmpeg: raise level for message printed in case of auto-select pixel format
Increase visibility, in order to decrease troubleshooting for
users generating non playable H.264 content.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Thu, 1 Aug 2013 14:21:31 +0000 (16:21 +0200)]
lavf/movenc: Write disc number and total number of discs as part of metadata.
Fixes ticket #2731.
Carl Eugen Hoyos [Thu, 1 Aug 2013 14:20:58 +0000 (16:20 +0200)]
lavf/movenc: Write total number of tracks as part of metadata.
Fixes ticket #2157.
Michael Niedermayer [Thu, 1 Aug 2013 11:59:47 +0000 (13:59 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avframe: have av_frame_get_side_data take const AVFrame*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 11:51:37 +0000 (13:51 +0200)]
Merge commit '
ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2 '
* commit '
ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2 ':
rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 31 Jul 2013 08:13:22 +0000 (10:13 +0200)]
h264_sei: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 31 Jul 2013 16:07:53 +0000 (18:07 +0200)]
h264_sei: Remove pointless old comment
Michael Niedermayer [Thu, 1 Aug 2013 11:24:53 +0000 (13:24 +0200)]
Merge commit '
1851e1d05d06f6ef3436c667e4354da0f407b226 '
* commit '
1851e1d05d06f6ef3436c667e4354da0f407b226 ':
rtpproto: Check the size before reading buf[1]
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 11:16:56 +0000 (13:16 +0200)]
Merge commit '
7748dd41be3d6dd6300f14263586af4ee104ead2 '
* commit '
7748dd41be3d6dd6300f14263586af4ee104ead2 ':
avconv: add -n option to immediately exit when output files already exist
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg_opt.c
See:
0a4f02117b67c135a27e3490aea1631ad9f4312f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 10:46:38 +0000 (12:46 +0200)]
Merge commit '
b85dbe68e222586fd77332716eb8ed5724db4e1b '
* commit '
b85dbe68e222586fd77332716eb8ed5724db4e1b ':
avconv: Call exit_program instead of exit in avconv_opt as well
Conflicts:
ffmpeg_opt.c
See:
eeddeb6579d8133871dc15f989ab8ffec5b5b396
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 30 Jul 2013 17:42:21 +0000 (19:42 +0200)]
twinvq: Add proper twinvq prefixes to identifiers
Diego Biurrun [Wed, 31 Jul 2013 21:56:26 +0000 (23:56 +0200)]
flvdec: Eliminate completely silly goto
Diego Biurrun [Wed, 31 Jul 2013 22:10:40 +0000 (00:10 +0200)]
flvdec: K&R formatting cosmetics
Diego Biurrun [Wed, 31 Jul 2013 21:59:05 +0000 (23:59 +0200)]
flvdec: Fix = vs. == typo in sample rate check
Michael Niedermayer [Thu, 1 Aug 2013 10:30:30 +0000 (12:30 +0200)]
Merge commit '
c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b '
* commit '
c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b ':
avopt: Check whether the object actually has got an AVClass
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 10:02:33 +0000 (12:02 +0200)]
Merge commit '
b7e6da988bfd5def40ccf3476eb8ce2f98a969a5 '
* commit '
b7e6da988bfd5def40ccf3476eb8ce2f98a969a5 ':
rtpproto: Move rtpproto specific function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:58:13 +0000 (11:58 +0200)]
Merge commit '
892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec '
* commit '
892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec ':
rtpproto: Simplify the rtp_read function by looping over the fds
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:53:49 +0000 (11:53 +0200)]
Merge commit '
7531588fffbca1f0afdcc06635999c00dfc16ca6 '
* commit '
7531588fffbca1f0afdcc06635999c00dfc16ca6 ':
rtpproto: Remove a misplaced comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:47:35 +0000 (11:47 +0200)]
Merge commit '
54e03ff6af8a070f1055edd26028f3f7b2e2ca8e '
* commit '
54e03ff6af8a070f1055edd26028f3f7b2e2ca8e ':
rtpproto: Support nonblocking reads
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:42:25 +0000 (11:42 +0200)]
Merge commit '
2e814d0329aded98c811d0502839618f08642685 '
* commit '
2e814d0329aded98c811d0502839618f08642685 ':
rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:36:54 +0000 (11:36 +0200)]
Merge commit '
45dd1ae1b3c18331f3db2293a9135bc5851e553f '
* commit '
45dd1ae1b3c18331f3db2293a9135bc5851e553f ':
avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs
Conflicts:
libavfilter/buffer.c
libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:23:45 +0000 (11:23 +0200)]
avutil/tree: fix memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Aug 2013 09:06:38 +0000 (11:06 +0200)]
Merge commit '
c2e936de07d054bf476e60445b453bf6b4836820 '
* commit '
c2e936de07d054bf476e60445b453bf6b4836820 ':
tree-test: Refactor and plug memory leaks
Conflicts:
libavutil/tree.c
Most of this commit is not merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 1 Aug 2013 06:51:10 +0000 (09:51 +0300)]
rtsp: Simplify code for forming the remote peer url
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 1 Aug 2013 08:41:01 +0000 (10:41 +0200)]
Merge commit '
a9b04b2c43f95cc17c2291f83c27a3119471d986 '
* commit '
a9b04b2c43f95cc17c2291f83c27a3119471d986 ':
tree.h: K&R formatting and typo cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Tue, 30 Jul 2013 15:39:07 +0000 (17:39 +0200)]
avframe: have av_frame_get_side_data take const AVFrame*
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Wed, 31 Jul 2013 08:48:28 +0000 (11:48 +0300)]
rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url
A separate rtcp port can already be set when opening the rtp
protocol normally, but when doing port setup as in RTSP (where
we first need to open the local ports and pass them to the peer,
and only then receive the remote peer port numbers), we didn't
check the same url parameter as in the normal open routine.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 31 Jul 2013 09:45:33 +0000 (12:45 +0300)]
rtpproto: Check the size before reading buf[1]
I doubt that anyone ever would try to send a 1 byte packet
via the RTP protocol, but check just in case - it shouldn't
crash at least.
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Utkin [Sun, 14 Jul 2013 10:43:25 +0000 (13:43 +0300)]
doc/protocols: Document file protocol options
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 26 Jul 2013 21:45:10 +0000 (21:45 +0000)]
lclenc: remove unused code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 26 Jul 2013 14:16:42 +0000 (14:16 +0000)]
sunrastenc: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 31 Jul 2013 14:57:27 +0000 (14:57 +0000)]
jv: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 29 Jul 2013 15:27:05 +0000 (15:27 +0000)]
mss3: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 29 Jul 2013 15:20:15 +0000 (15:20 +0000)]
mss2: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 26 Jul 2013 14:58:44 +0000 (14:58 +0000)]
indeo2: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 26 Jul 2013 14:41:38 +0000 (14:41 +0000)]
smacker: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vittorio Giovara [Wed, 31 Jul 2013 12:48:49 +0000 (14:48 +0200)]
avconv: add -n option to immediately exit when output files already exist
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Utkin [Wed, 31 Jul 2013 12:22:02 +0000 (15:22 +0300)]
Document new 'blocksize' option of 'pipe' protocol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 31 Jul 2013 12:22:01 +0000 (15:22 +0300)]
file: Add 'blocksize' option
Interruptibility of file operations is strongly desirable in case of
slow storage access, e.g. mounted network share.
This commit introduces possibility to limit data quantity transferred by
'file' protocol at once. By default, old behaviour is preserved and data
is still tried to be transferred without block size limitation.
Note that file I/O operation still may block (or even freeze) inside of
single read(2) or write(2) operation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 31 Jul 2013 10:44:17 +0000 (13:44 +0300)]
avconv: Call exit_program instead of exit in avconv_opt as well
This seems to have been missed in
636ced8e1dc .
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 29 Jul 2013 11:53:01 +0000 (14:53 +0300)]
avopt: Check whether the object actually has got an AVClass
AVIOContext has got an av_class member that only gets set if
opening the context using avio_open2, but not if allocating a
custom IO context. A caller that wants to read AVOptions from
an AVIOContext (recursively using AV_OPT_SEARCH_CHILDREN) may
not know if the AVIOContext actually has got a class set or not.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 31 Jul 2013 09:29:32 +0000 (12:29 +0300)]
rtpproto: Move rtpproto specific function declarations to a separate header
Mixing these with the rtp depacketizer functions in rtpdec.h is
no good.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 31 Jul 2013 09:21:47 +0000 (12:21 +0300)]
rtpproto: Simplify the rtp_read function by looping over the fds
This avoids having duplicate code where only the fd parameter
differs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 31 Jul 2013 09:17:51 +0000 (12:17 +0300)]
rtpproto: Remove a misplaced comment
The fdset is a pollfd array nowadays, and it is already populated
at this point.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 26 Jul 2013 17:24:06 +0000 (20:24 +0300)]
rtpproto: Support nonblocking reads
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 9 Jan 2013 16:55:52 +0000 (18:55 +0200)]
rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Mon, 29 Jul 2013 18:49:53 +0000 (20:49 +0200)]
avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs
Diego Biurrun [Tue, 30 Jul 2013 15:28:44 +0000 (17:28 +0200)]
tree-test: Refactor and plug memory leaks
With the most annoying memory leak found by Derek Buitenhuis.
Diego Biurrun [Tue, 30 Jul 2013 17:41:47 +0000 (19:41 +0200)]
tree.h: K&R formatting and typo cosmetics
Timothy Gu [Wed, 31 Jul 2013 02:40:45 +0000 (19:40 -0700)]
libxvid: Add SSIM displaying through a libxvidcore plugin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 31 Jul 2013 02:39:06 +0000 (19:39 -0700)]
libxvid: add working lumimasking and variance AQ
The old implementation is unusable due to change in the Xvid API.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 31 Jul 2013 09:01:30 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hls: Call avformat_find_stream_info() on the chained demuxers
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Romain Beauxis [Sun, 21 Jul 2013 20:40:08 +0000 (15:40 -0500)]
Support for shine 3.0.0
Paul B Mahol [Tue, 30 Jul 2013 19:27:43 +0000 (19:27 +0000)]
lavf/webvttenc: use proper printf format for int64_t values
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 30 Jul 2013 18:29:46 +0000 (20:29 +0200)]
avfilter/af_compand: %f is for printing doubles
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 18:48:51 +0000 (20:48 +0200)]
avcodec/get_bits: place volatile at the right spot
Should fix Ticket2825
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 18:26:38 +0000 (20:26 +0200)]
avcodec/get_bits: init_state is used for thread sync, make it volatile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 30 Jul 2013 02:12:10 +0000 (19:12 -0700)]
doc/encoders: add libxvid doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Tue, 30 Jul 2013 13:09:13 +0000 (15:09 +0200)]
asfdec: Skip to keyframe after seeking
Fixes Ticket1616
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 10:34:34 +0000 (12:34 +0200)]
avdevice/timefilter: cleanup the formating of the test output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 10:32:05 +0000 (12:32 +0200)]
avutil/pixfmt: dont refer to deprecated PIX_FMT in the documentation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 10:29:20 +0000 (12:29 +0200)]
avformat/gxfenc: replace deprecated PIX_FMT constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 10:03:12 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
Conflicts:
libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 09:57:37 +0000 (11:57 +0200)]
Merge commit '
1f57d60129b0e297cd197c6031c4439b30a6b503 '
* commit '
1f57d60129b0e297cd197c6031c4439b30a6b503 ':
rtsp: Support RFC4570 (source specific multicast) more properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 09:51:14 +0000 (11:51 +0200)]
Merge commit '
74972220909787af5a3ffe66f7fa8041827c2bd2 '
* commit '
74972220909787af5a3ffe66f7fa8041827c2bd2 ':
rtpproto: Support more than one SSM include address, support excludes
Conflicts:
libavformat/rtpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 09:40:05 +0000 (11:40 +0200)]
Merge commit '
7d99c92945e4b2d12ed2126365482e1900340da0 '
* commit '
7d99c92945e4b2d12ed2126365482e1900340da0 ':
udp: Keep track of include and exclude sources separately
Conflicts:
libavformat/udp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 09:31:08 +0000 (11:31 +0200)]
Merge commit '
3357bccc5cb31795f248cd72dc480025f3075a5b '
* commit '
3357bccc5cb31795f248cd72dc480025f3075a5b ':
udp: Allow specifying multicast include/blocks as host names as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Jul 2012 15:40:33 +0000 (17:40 +0200)]
hls: Call avformat_find_stream_info() on the chained demuxers
This allows the chained demuxer (or more precisely, the lavf
utility code) to better fill in timestamps on packets from
these, especially for cases where one stream is a raw ADTS
stream.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 30 Jul 2013 09:26:39 +0000 (11:26 +0200)]
Merge commit '
0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8 '
* commit '
0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8 ':
avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo
Conflicts:
doc/general.texi
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jul 2013 09:20:06 +0000 (11:20 +0200)]
Merge commit '
4822ee3ca620a92cd2b0a9a03ea9e34288192c79 '
* commit '
4822ee3ca620a92cd2b0a9a03ea9e34288192c79 ':
configure: Detect AIX ar command instead of hardcoding it in the OS section
Merged-by: Michael Niedermayer <michaelni@gmx.at>