]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 20 Sep 2013 12:37:52 +0000 (14:37 +0200)]
Merge commit '
d8b68660145c76a23fc9665f96932449514ecad2 '
* commit '
d8b68660145c76a23fc9665f96932449514ecad2 ':
yop: Clear all references to the AVBuffer in the local AVPacket
Conflicts:
libavformat/yop.c
See:
551f683861bbae1002542e70dc196244a1cd24ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 12:13:52 +0000 (14:13 +0200)]
Merge commit '
3185a80259ce1f8f8111073dbd14a69a396e03a3 '
* commit '
3185a80259ce1f8f8111073dbd14a69a396e03a3 ':
fraps: Make the input buffer size checks more strict
Conflicts:
libavcodec/fraps.c
The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 11:41:26 +0000 (13:41 +0200)]
Merge commit '
82e266c6d3fbf3cc74e515b883e66543381a0f2c '
* commit '
82e266c6d3fbf3cc74e515b883e66543381a0f2c ':
segafilm: Validate the number of audio channels
Merge only for metadata as the change is incorrect, checking audio
parameters in video only files
See:
192db16b9c202e8d037c4820b11e125d8010e7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 11:29:39 +0000 (13:29 +0200)]
Merge commit '
601c2015bc16f0b281160292a6a760cbbbb0eacb '
* commit '
601c2015bc16f0b281160292a6a760cbbbb0eacb ':
svq3: Avoid a division by zero
Conflicts:
libavcodec/svq3.c
See:
4fa706a4a64f9e06b08c1a42a62893ff2f7de82f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 11:20:06 +0000 (13:20 +0200)]
Merge commit '
7a5a55722749a3ab77941914707277b147322cbe '
* commit '
7a5a55722749a3ab77941914707277b147322cbe ':
qpeg: Add checks for running out of rows in qpeg_decode_inter
Conflicts:
libavcodec/qpeg.c
See:
4299dfa5ded84111231a456ad102f65f6f62649e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 11:05:37 +0000 (13:05 +0200)]
Merge commit '
e9d61de96c113ee0ef8082833c7e682df0e23eec '
* commit '
e9d61de96c113ee0ef8082833c7e682df0e23eec ':
mpegaudiodec: Validate that the number of channels fits at the given offset
Conflicts:
libavcodec/mpegaudiodec.c
See:
51fcf276f8ce66be530549da6b8d96a4bd3087aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 10:50:05 +0000 (12:50 +0200)]
avcodec/asvdec: dont fail without extradata
extradata is not mandatory to decode asv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 10:42:51 +0000 (12:42 +0200)]
Merge commit '
f50803354c6acb4575379d7c54ca48ec5d36dd61 '
* commit '
f50803354c6acb4575379d7c54ca48ec5d36dd61 ':
asvdec: Verify the amount of extradata
See:
605f2b6b004eee4dc57832257169ff8eaa562fb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 10:37:24 +0000 (12:37 +0200)]
Merge commit '
72fe16a13e3ebd5396ac173bf84c8b20085c16d5 '
* commit '
72fe16a13e3ebd5396ac173bf84c8b20085c16d5 ':
movenc: Use null buffers for measuring the amount of data to be written
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 10:25:58 +0000 (12:25 +0200)]
Merge commit '
3627ce2f1dab1d33b7f99d78907a3e4d86b7d847 '
* commit '
3627ce2f1dab1d33b7f99d78907a3e4d86b7d847 ':
aviobuf: Add functions for null buffers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 09:56:26 +0000 (11:56 +0200)]
Merge commit '
bb461370e34b1fa1637f34ce7d37b934ddb472d5 '
* commit '
bb461370e34b1fa1637f34ce7d37b934ddb472d5 ':
asfenc: mux chapters in ASF files using an ASF "marker" section
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 09:43:32 +0000 (11:43 +0200)]
Merge commit '
09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9 '
* commit '
09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9 ':
asfenc: remember send time and offset of the index entries
Conflicts:
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 09:18:13 +0000 (11:18 +0200)]
Merge commit '
1eb932803037a3c9f98f66aeb80024dfa3c5c743 '
* commit '
1eb932803037a3c9f98f66aeb80024dfa3c5c743 ':
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 09:06:09 +0000 (11:06 +0200)]
Merge commit '
c53b5dda352452e79a9e962cd4c74c813186d9ed '
* commit '
c53b5dda352452e79a9e962cd4c74c813186d9ed ':
asfdec: replace magic constant with DATA_HEADER_SIZE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 08:56:54 +0000 (10:56 +0200)]
Merge commit '
5f408333601a827054335f309defcb246a532b21 '
* commit '
5f408333601a827054335f309defcb246a532b21 ':
asfdec: substract preroll time from marker presentation time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Monty Montgomery [Wed, 11 Sep 2013 06:00:31 +0000 (02:00 -0400)]
avformat/matroskadec: correct spurious keyframe warnings in webm
Minor change to fix for Trac #1003 to avoid squawking about files
with valid keyframes that aren't marked (as opposed to frames that are
marked as keyframes and aren't).
Change correctly surpresses the spurious warnings, while still complaining
about (and handling) the genuinely broken file attached to bug #1003.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 16 Sep 2013 18:03:27 +0000 (18:03 +0000)]
avformat/matroskadec: use av_malloc_array() and check for allocation error
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 19 Sep 2013 21:09:16 +0000 (23:09 +0200)]
swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1
Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 20:46:52 +0000 (22:46 +0200)]
avutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Aug 2013 15:10:10 +0000 (17:10 +0200)]
avutil: add av_get_colorspace_name()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 13:25:48 +0000 (15:25 +0200)]
avformat/bmv: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 19 Sep 2013 13:49:48 +0000 (16:49 +0300)]
yop: Clear all references to the AVBuffer in the local AVPacket
This makes sure that it doesn't try to free an AVBuffer belonging
to an earlier packet when we free the local packet at the end.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 13:29:23 +0000 (16:29 +0300)]
fraps: Make the input buffer size checks more strict
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 13:02:29 +0000 (16:02 +0300)]
segafilm: Validate the number of audio channels
This avoids divisions by zero later.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 12:58:59 +0000 (15:58 +0300)]
svq3: Avoid a division by zero
If the height is zero, the decompression will probably end up
failing due to not fitting into the allocated buffer later
anyway, so this doesn't need any more elaborate check.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 12:53:31 +0000 (15:53 +0300)]
qpeg: Add checks for running out of rows in qpeg_decode_inter
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 12:32:02 +0000 (15:32 +0300)]
mpegaudiodec: Validate that the number of channels fits at the given offset
This is similar to the fix in
35cbc98b .
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Sep 2013 12:14:56 +0000 (15:14 +0300)]
asvdec: Verify the amount of extradata
The init function reads one byte of extradata.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 18 Sep 2013 19:02:17 +0000 (22:02 +0300)]
movenc: Use null buffers for measuring the amount of data to be written
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 18 Sep 2013 18:50:50 +0000 (21:50 +0300)]
aviobuf: Add functions for null buffers
Null buffers are useful for simulating writing to a real buffer
for the sake of measuring how many bytes are written.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Wed, 11 Sep 2013 13:46:33 +0000 (13:46 +0000)]
avfilter/vf_decimate: add gray16 and yuv440p
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:38 +0000 (17:50 +0200)]
asfenc: mux chapters in ASF files using an ASF "marker" section
ASF markers only have a start time, so we lose the chapter end times,
but that is ASF for you
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Paul B Mahol [Thu, 19 Sep 2013 17:50:18 +0000 (17:50 +0000)]
avfilter/vf_decimate: fix crash with gray8
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:37 +0000 (17:50 +0200)]
asfenc: remember send time and offset of the index entries
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:36 +0000 (17:50 +0200)]
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:35 +0000 (17:50 +0200)]
asfdec: replace magic constant with DATA_HEADER_SIZE
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:34 +0000 (17:50 +0200)]
asfdec: substract preroll time from marker presentation time
this was forgotten when we changed ASF to not output the preroll time
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Paul B Mahol [Wed, 18 Sep 2013 21:52:49 +0000 (21:52 +0000)]
doc: Add missing hashes and dates to APIChanges
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 18 Sep 2013 22:47:47 +0000 (22:47 +0000)]
lavfi/mp: remove mp=qp
The filter does nothing.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 19 Sep 2013 12:51:46 +0000 (14:51 +0200)]
avformat/concat: revert one hunk of
20dfab33f5ab61fc51de65192ed239f8b62782a2
The deallocated memory contains resources that need to be freed before it
can be deallocated. The original code was correct.
This also fixes a double free
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 12:20:21 +0000 (14:20 +0200)]
avformat/smacker: Check if bufs has been allocated before use
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 11:39:03 +0000 (13:39 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: Fix a memory leak on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 11:33:25 +0000 (13:33 +0200)]
Merge commit '
bcbe4f3ceb6ee0210d3a401963518906c8b9b230 '
* commit '
bcbe4f3ceb6ee0210d3a401963518906c8b9b230 ':
idroqdec: Make sure a video stream has been allocated before returning packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 11:07:54 +0000 (13:07 +0200)]
Merge commit '
5372cda67109848d22146289e401669266217e80 '
* commit '
5372cda67109848d22146289e401669266217e80 ':
rv10: Validate the dimensions set from the container
This check could be replaced by a width==0||height==0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 11:02:54 +0000 (13:02 +0200)]
Michael Niedermayer [Thu, 19 Sep 2013 10:55:26 +0000 (12:55 +0200)]
Merge commit '
1914e6f010b3320025c7b692aaea51d9b9a992a8 '
* commit '
1914e6f010b3320025c7b692aaea51d9b9a992a8 ':
aacdec: Add support for LD (Low Delay) AAC
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 10:44:06 +0000 (12:44 +0200)]
Merge commit '
5cdefc02079a5b899bdec09e15e2bb099cb01734 '
* commit '
5cdefc02079a5b899bdec09e15e2bb099cb01734 ':
aacdec: Add support for Error Resilience syntax.
Conflicts:
Changelog
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 10:06:39 +0000 (12:06 +0200)]
Merge commit '
c4bfa098072ba338d83555d6e2199f7e1e64ffff '
* commit '
c4bfa098072ba338d83555d6e2199f7e1e64ffff ':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 09:47:32 +0000 (11:47 +0200)]
Merge commit '
9ae53c5860e17d087642d27b00dade071970a2e7 '
* commit '
9ae53c5860e17d087642d27b00dade071970a2e7 ':
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 18 Sep 2013 23:49:41 +0000 (01:49 +0200)]
rtmp: Unbreak handle_notify
Commit
5626f994f273af80fb100d4743b963304de9e05c broke it.
Michael Niedermayer [Thu, 19 Sep 2013 09:01:26 +0000 (11:01 +0200)]
Merge commit '
5626f994f273af80fb100d4743b963304de9e05c '
* commit '
5626f994f273af80fb100d4743b963304de9e05c ':
avformat: Use av_reallocp() where suitable
Conflicts:
libavformat/avidec.c
libavformat/avienc.c
libavformat/aviobuf.c
libavformat/oggparsevorbis.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Sep 2013 08:38:40 +0000 (10:38 +0200)]
Merge commit '
0f310a6f333b016d336674d086045e8473fdf918 '
* commit '
0f310a6f333b016d336674d086045e8473fdf918 ':
rmdec: Validate the fps value
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 22 Oct 2012 14:01:29 +0000 (16:01 +0200)]
ffprobe: add -read_intervals option
This is also useful to test seeking on an input file.
This also addresses trac ticket #1437.
Martin Storsjö [Mon, 16 Sep 2013 13:05:18 +0000 (16:05 +0300)]
rv34: Fix a memory leak on errors
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 16 Sep 2013 11:53:15 +0000 (14:53 +0300)]
idroqdec: Make sure a video stream has been allocated before returning packets
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 16 Sep 2013 12:40:57 +0000 (15:40 +0300)]
rv10: Validate the dimensions set from the container
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Wed, 18 Sep 2013 22:46:53 +0000 (00:46 +0200)]
doc/muxers: itemize tee examples
Improve rendering.
Luca Barbato [Wed, 18 Sep 2013 23:49:41 +0000 (01:49 +0200)]
rtmp: Unbreak handle_notify
Commit
5626f994f273af80fb100d4743b963304de9e05c broke it.
James Almer [Wed, 18 Sep 2013 03:59:34 +0000 (00:59 -0300)]
matroskaenc: Write muxingapp and writingapp elements when using bitexact flag
Files won't validate with mkvalidtor if these two elements are missing.
Use a const "Lavf" string that wont change with library version bumps.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 18 Sep 2013 03:55:58 +0000 (00:55 -0300)]
fate: Fix exif tests ffprobe dependency
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 18 Sep 2013 04:06:15 +0000 (01:06 -0300)]
doc/APIchanges: Fix two hashes
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 18 Sep 2013 19:17:34 +0000 (19:17 +0000)]
avfilter/vf_telecine: remove redudant av_frame_copy_props()
It is already called by av_frame_clone().
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Alex Converse [Mon, 16 Sep 2013 20:03:15 +0000 (13:03 -0700)]
aacdec: Add support for LD (Low Delay) AAC
Alex Converse [Mon, 16 Sep 2013 06:32:23 +0000 (23:32 -0700)]
aacdec: Add support for Error Resilience syntax.
This does not add support for any error resilience tools.
Justin Ruggles [Tue, 16 Apr 2013 17:12:26 +0000 (22:42 +0530)]
Add a WebP decoder
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Mon, 16 Sep 2013 14:11:32 +0000 (10:11 -0400)]
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
Alexandra Khirnova [Wed, 18 Sep 2013 16:12:36 +0000 (18:12 +0200)]
avformat: Use av_reallocp() where suitable
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Paul B Mahol [Wed, 18 Sep 2013 12:46:44 +0000 (12:46 +0000)]
avfilter/vf_pullup: remove junk_down nonsense
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 18 Sep 2013 11:55:04 +0000 (11:55 +0000)]
avfilter/vf_pullup: change log level to error
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 18 Sep 2013 11:49:58 +0000 (11:49 +0000)]
avfilter/vf_pullup: fix memleak of metrics for last PullupField
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 18 Sep 2013 11:23:36 +0000 (13:23 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Add an option for omitting the tfhd base offset
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 18 Sep 2013 11:27:41 +0000 (11:27 +0000)]
avfilter/vf_pullup: make sure metric_plane is available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 18 Sep 2013 11:04:11 +0000 (11:04 +0000)]
lavfi/mp: remove mp=pullup
The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 18 Sep 2013 10:47:47 +0000 (12:47 +0200)]
Merge commit '
a4adabb460ace39783d707a5b3bbe28b4b5b9dc4 '
* commit '
a4adabb460ace39783d707a5b3bbe28b4b5b9dc4 ':
movenc: Write the moof atom in two passes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 10:26:32 +0000 (12:26 +0200)]
Michael Niedermayer [Wed, 18 Sep 2013 10:08:37 +0000 (12:08 +0200)]
Merge commit '
8583b14252deac71136f1dec231910abab0ba503 '
* commit '
8583b14252deac71136f1dec231910abab0ba503 ':
rtmp: Support reading interleaved chunks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 09:24:27 +0000 (11:24 +0200)]
Merge commit '
d4c2a3740fb95f952a87ba320d2bf31f126bdf68 '
* commit '
d4c2a3740fb95f952a87ba320d2bf31f126bdf68 ':
xmv: Add more sanity checks for parameters read from the bitstream
Conflicts:
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 09:08:43 +0000 (11:08 +0200)]
Merge commit '
dc4acc820076b2149ef6c921bdabe05d07ca1bc6 '
* commit '
dc4acc820076b2149ef6c921bdabe05d07ca1bc6 ':
rtmpproto: Extend a comment to explain the prev_pkt arrays roles
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 09:00:47 +0000 (11:00 +0200)]
Merge commit '
647d655d19c38e9716328e4787199149097d6089 '
* commit '
647d655d19c38e9716328e4787199149097d6089 ':
rtmpproto: Consistently use the right prev_pkt array
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 08:50:49 +0000 (10:50 +0200)]
Merge commit '
0d3784396b736374a61fea26268febdabd803a59 '
* commit '
0d3784396b736374a61fea26268febdabd803a59 ':
rtmpproto: Check for the right return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 08:39:34 +0000 (10:39 +0200)]
Merge commit '
8411baf6f0a42bdd61f00f34aa9efec7e138b5f2 '
* commit '
8411baf6f0a42bdd61f00f34aa9efec7e138b5f2 ':
dca_parser: Handle changes in DCA frame size
Conflicts:
libavcodec/dca_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 16 Sep 2013 17:58:38 +0000 (20:58 +0300)]
rmdec: Validate the fps value
Abort if it is invalid if strict error checking has been requested.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 18 Sep 2013 08:04:43 +0000 (10:04 +0200)]
avcodec/jpeg2000dec: move "missing SIZ" check up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Sep 2013 07:40:53 +0000 (09:40 +0200)]
Merge commit '
18a245a2aea31b92bc435f2962a71e060d83b5f7 '
* commit '
18a245a2aea31b92bc435f2962a71e060d83b5f7 ':
jpeg2000dec: Add more checks when parsing headers
The check cannot be true in FFmpeg, but does no harm.
I will move it in a subsequent commit so it can detect missing SIZ
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Sep 2013 23:42:18 +0000 (01:42 +0200)]
doc/APIchanges: List merge commit hashes and version numbers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mrlika [Mon, 2 Sep 2013 12:10:22 +0000 (15:10 +0300)]
lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns EINVAL without a valid match
With some (buggy) drivers, the VIDIOC_G_STD ioctl returns a std_id that cannot
be matched with any of the enumerated v4l2_standard structures (for example
std_id = 0 or std_id = 0xffffff). Do not fail when we reach the end of the
enumeration without a valid match.
Fixes ticket #2370
Note: This commit message has been modified by Giorgio Vazzana, the original
commit message was:
"Fixed regression for mandatory VIDIOC_ENUMSTD support by v4l2"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 9 Sep 2013 12:04:57 +0000 (15:04 +0300)]
movenc: Add an option for omitting the tfhd base offset
This makes the output fragments independent of their position in
the output stream, making the output work better when streamed.
QuickTime Player doesn't support fragmented mp4 without the base
data offset, though.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 9 Sep 2013 09:05:01 +0000 (12:05 +0300)]
movenc: Write the moof atom in two passes
This is a bit more work, but avoids having to fill in
the data offset field afterwards instead of directly when
the rest of the trun atom is written.
This simplifies future cases where this field needs to be set to
something different.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 17 Sep 2013 16:33:48 +0000 (19:33 +0300)]
twinvqdec: Check the ibps parameter separately
This is required, since invalid parameters actually could
pass the switch check below.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Josh Allmann [Tue, 17 Sep 2013 06:58:48 +0000 (23:58 -0700)]
rtmp: Support reading interleaved chunks.
A given packet won't always come in contiguously; sometimes
they may be broken up on chunk boundaries by packets of another
channel.
This support primarily involves tracking information about the
data that's been read, so the reader can pick up where it left
off for a given channel.
As a side effect, we no longer over-report the bytes read if
(toread = MIN(size, chunk_size)) == size
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 17 Sep 2013 19:48:54 +0000 (21:48 +0200)]
swscale/utils: remove redundant NULL checks before sws_freeVec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Sep 2013 19:31:58 +0000 (21:31 +0200)]
swscale/utils: simplify cpu caps printing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Sep 2013 19:29:42 +0000 (21:29 +0200)]
swscale/utils: Simplify scaler name printing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lenny Wang [Tue, 10 Sep 2013 07:57:54 +0000 (02:57 -0500)]
OpenCL: convert meaningless "device id" output to "device name"
Approved-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 16 Sep 2013 18:20:08 +0000 (18:20 +0000)]
avformat/smacker: use av_malloc_array() and check for allocation error
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 16 Sep 2013 22:57:11 +0000 (00:57 +0200)]
lavf/options_table: improve option help text
Contains text suggested by carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Chih-Wei Huang [Tue, 17 Sep 2013 15:36:48 +0000 (23:36 +0800)]
avformat/asfenc: fix a build error
It's introduced by the erroneous merging commit
cbe47b1e .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 17 Sep 2013 17:15:43 +0000 (17:15 +0000)]
avfilter/x86/vf_pullup: try to fix build on x64
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Mon, 16 Sep 2013 18:27:49 +0000 (21:27 +0300)]
xmv: Add more sanity checks for parameters read from the bitstream
Since the number of channels is multiplied by 36 and assigned to
to a uint16_t, make sure this calculation didn't overflow. (In
certain cases the calculation could overflow leaving the
truncated block_align at 0, leading to divisions by zero later.)
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 17 Sep 2013 14:43:48 +0000 (17:43 +0300)]
rtmpproto: Extend a comment to explain the prev_pkt arrays roles
Signed-off-by: Martin Storsjö <martin@martin.st>