]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 23 Sep 2013 09:40:10 +0000 (11:40 +0200)]
Merge commit '
5840473890440dbe0bd2cce530ebb3d93e187ae6 '
* commit '
5840473890440dbe0bd2cce530ebb3d93e187ae6 ':
rtmp: Rewrite embedded flv handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:36:02 +0000 (11:36 +0200)]
Merge commit '
e40a0e822801d2485e4e555909d7a82713fa86a5 '
* commit '
e40a0e822801d2485e4e555909d7a82713fa86a5 ':
rtmp: Refactor get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Sep 2013 09:31:09 +0000 (11:31 +0200)]
Merge commit '
32a414f316c7f0eea877370e3f9d9f25afbf5da2 '
* commit '
32a414f316c7f0eea877370e3f9d9f25afbf5da2 ':
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Bradshaw [Tue, 17 Sep 2013 00:54:36 +0000 (18:54 -0600)]
libopenjpeg: init and close properly; don't config during encode
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 22 Sep 2013 23:42:33 +0000 (23:42 +0000)]
avcodec/escape124: fix infinite loop
Remove can_safely_read() as its not really needed with
checked bitstream reader.
Fixes #2984.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Timothy Gu [Sat, 21 Sep 2013 22:39:35 +0000 (15:39 -0700)]
doc/filters: add [] labels for the graph of the opening paragraph example
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Sat, 21 Sep 2013 18:36:12 +0000 (20:36 +0200)]
doc/filters: use between() function in select examples
Simplify.
Stefano Sabatini [Sat, 21 Sep 2013 08:19:21 +0000 (10:19 +0200)]
doc/fftools: rework some paragraph in the AVOptions chapter
Fix typos, and clarify note about codec AVOptions.
Paul B Mahol [Sun, 22 Sep 2013 20:39:16 +0000 (20:39 +0000)]
doc/filters: put ladspa configure option into @code{}
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 22 Sep 2013 18:44:54 +0000 (20:44 +0200)]
tests/fate/prores: fix skip alpha tests on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 18:36:21 +0000 (20:36 +0200)]
avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 22 Sep 2013 18:45:50 +0000 (18:45 +0000)]
doc/filters: mention configure option for ladspa
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Kieran Kunhya [Sun, 22 Sep 2013 15:54:47 +0000 (10:54 -0500)]
lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 22 Sep 2013 17:22:51 +0000 (17:22 +0000)]
avcodec/sgirledec: fix infinite loop in decode_sgirle8()
Fixes #2985.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 20 Sep 2013 14:01:00 +0000 (14:01 +0000)]
avfilter: add ladspa wrapper filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reimar Döffinger [Thu, 8 Aug 2013 18:27:24 +0000 (20:27 +0200)]
Make decoding alpha optional for some codecs.
For codecs where decoding of a whole plane can simply
be skipped, we should offer applications to not decode
alpha for better performance (ca. 30% less CPU usage
and 40% reduced memory bandwidth).
It also means applications do not need to implement support
(even if it is rather simple) for YUVA formats in order to be
able to play these files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 22 Sep 2013 13:58:13 +0000 (15:58 +0200)]
avformat/mov: reset extradata size when extradata gets deallocated due to realloc failure
This prevents the fields from becoming inconsistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Wed, 21 Aug 2013 03:04:46 +0000 (05:04 +0200)]
Fix nonsense MPEG-4 hwaccel code.
Issues with the code:
1) The skip_bits_long breaks packed B-frames since we skip
of the packed frame, even for VDPAU.
2) Calling ff_h263_find_resync_marker_reverse is nonsense for MPEG-4,
and for H.263 the only code using this (vaapi_mpeg4) explicitly reverts
this change!
3) mb_x/mb_y are always 0 when vaapi_mpeg4_decode_slice, so doing
computations with them is just obfuscation
4) due to not updating mb_y the code would always go into the error
resilience case, causing nonsense error messages and maybe further
issues.
While tested to fix the data provided to the decoder in case of
VDPAU so it is the same as for the non-hwaccel code, the VA-API code
was not tested to still work, and adding regression testing even
as a quick hack is much more complicated for it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 22 Sep 2013 13:06:22 +0000 (15:06 +0200)]
avformat/movenchint: use realloc_array() to protect against integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 13:05:35 +0000 (15:05 +0200)]
avformat/movenchint: only change queue size if reallocation succeeded
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 12:59:25 +0000 (14:59 +0200)]
avformat/movenchint: revert "Use av_reallocp() where suitable"
reverts movenchin part of
5626f994f273af80fb100d4743b963304de9e05c
The change left the fields in an inconsistent state
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 09:51:18 +0000 (11:51 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Fix compilation with inline asm disabled on mingw
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 09:37:09 +0000 (11:37 +0200)]
Merge commit '
e208e6d209728d332343aa5390ae377ac0a6305c '
* commit '
e208e6d209728d332343aa5390ae377ac0a6305c ':
lavu: Add interleaved 4:2:2 8/10-bit formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
See:
90ca5a9b5fc3f1484c389a44f40ee1af4b8f435e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Sep 2013 09:32:59 +0000 (11:32 +0200)]
avutil/pixdesc: try to fix NV20* descriptors
They where inconsistent (overlapping fields and wrong sizes)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Tue, 17 Sep 2013 21:30:48 +0000 (16:30 -0500)]
Add interleaved 4:2:2 8/10-bit formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 21 Sep 2013 09:10:41 +0000 (11:10 +0200)]
rtmp: Rewrite embedded flv handling
Use update_offset() as done for rtmp audio, video and notifications and
read update and write the fields instead of replacing them in the rtmp
packet and then memcpying it to the output buffer.
Luca Barbato [Sat, 21 Sep 2013 09:09:39 +0000 (11:09 +0200)]
rtmp: Refactor get_packet
Luca Barbato [Sat, 21 Sep 2013 08:04:54 +0000 (10:04 +0200)]
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
And fix the AMF_DATA_TYPE_ARRAY parsing while at it.
A MIXEDARRAY type, as the ARRAY, store the number of elements in
an uint32 before the list. The ARRAY is strict and does not have
an OBJECT terminator, MIXEDARRAY behaves like an OBJECT type and
a different than stated number of element can be present.
Michael Niedermayer [Sat, 21 Sep 2013 21:34:11 +0000 (23:34 +0200)]
avcodec/g2meet: Fix framebuf size
Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.
Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Compn [Sat, 21 Sep 2013 21:57:08 +0000 (17:57 -0400)]
changelog: add fraps and libx264 changes
Alex Smith [Sat, 21 Sep 2013 11:22:12 +0000 (07:22 -0400)]
avutil: Fix compilation with inline asm disabled on mingw
Because of -Werror=implicit-function-declaration the build will fail.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 21 Sep 2013 18:59:30 +0000 (20:59 +0200)]
avformat/hls: do not limit manifest lines to 1024 chars
Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Tue, 17 Sep 2013 21:30:48 +0000 (16:30 -0500)]
lavu: Add interleaved 4:2:2 8/10-bit formats
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 21 Sep 2013 14:59:13 +0000 (16:59 +0200)]
avcodec: fix duplicate includes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Sep 2013 14:58:58 +0000 (16:58 +0200)]
avformat/network: fix duplicate include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 21 Sep 2013 14:30:46 +0000 (16:30 +0200)]
lavf/libssh: add MAINTAINERS entry
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Smith [Sat, 21 Sep 2013 13:22:55 +0000 (09:22 -0400)]
lavu/attributes: Don't define av_restrict
This is always defined in config.h.
Original patch by Derek Buitenhuis.
Michael Niedermayer [Sat, 21 Sep 2013 13:11:12 +0000 (15:11 +0200)]
avformat: remove duplicate includes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Sep 2013 13:04:04 +0000 (15:04 +0200)]
avdevice/v4l: remove duplicate include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Sep 2013 13:02:34 +0000 (15:02 +0200)]
avfilter: remove duplicate includes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Sep 2013 12:55:57 +0000 (14:55 +0200)]
avutil/cpu: remove duplicate include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 17 Sep 2013 18:26:43 +0000 (18:26 +0000)]
avcodec/fraps: use BT.709 colorspace for YUV Fraps versions
Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.
Paul B Mahol [Thu, 19 Sep 2013 17:39:08 +0000 (17:39 +0000)]
lavfi/pad,crop,scale: remove options description from filter description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 20 Sep 2013 10:35:01 +0000 (10:35 +0000)]
avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Alex Smith [Sat, 21 Sep 2013 12:32:24 +0000 (08:32 -0400)]
tools: Fix apparent merge failure
James Almer [Sat, 21 Sep 2013 01:15:49 +0000 (22:15 -0300)]
matroska: Add the CueDuration element
Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Sep 2013 12:07:36 +0000 (14:07 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow encoding YUVJ422P and YUVJ444P with libx264.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 21 Sep 2013 10:17:20 +0000 (12:17 +0200)]
Remove '-vf' from pullup documentation example.
Michael Niedermayer [Sat, 21 Sep 2013 09:57:06 +0000 (11:57 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264dec: Add .avc file name extension
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Sep 2013 09:09:38 +0000 (11:09 +0200)]
Merge commit '
01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9 '
* commit '
01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9 ':
h264dec: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 21 Sep 2013 07:52:47 +0000 (09:52 +0200)]
Allow encoding YUVJ422P and YUVJ444P with libx264.
Reviewed-by: Reimar
Reimar Döffinger [Wed, 18 Sep 2013 23:08:30 +0000 (01:08 +0200)]
mpeg4dec: Ensure data is not clobbered too early.
Avoid overwriting the bitstream buffer data before we
have ended processing the frame.
This is necessary to fix hwaccels which might try to use
the buffer during the end_frame call.
I am not sure but it is possible this could even trigger
a use-after-free if the av_fast_malloc allocated a new buffer.
This would require that decode_slice did not wind the bitstream
forward all the way to the end, which does not currently happen in
normal streams.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sat, 21 Sep 2013 07:31:29 +0000 (09:31 +0200)]
Merge commit '
67e285ceca1cb602a5ab87010b30d904527924fe '
* commit '
67e285ceca1cb602a5ab87010b30d904527924fe ':
mem: Handle av_reallocp(..., 0) properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 19 Sep 2013 17:32:09 +0000 (17:32 +0000)]
fate: add adelay test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reimar Döffinger [Wed, 18 Sep 2013 17:55:40 +0000 (19:55 +0200)]
dvbsubdec: Check for invalid clut selector.
Fail decoding if strict compliance is requested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
JULIAN GARDNER [Wed, 4 Sep 2013 21:51:34 +0000 (22:51 +0100)]
Apply clut changes only to one table.
The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Lukasz Marek [Wed, 18 Sep 2013 12:08:11 +0000 (14:08 +0200)]
lavf: add SFTP protocol via libssh
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 21 Sep 2013 00:06:19 +0000 (02:06 +0200)]
Improve pullup documentation.
Mention that the fps filter should be used after pullup.
Michael Niedermayer [Sat, 21 Sep 2013 01:02:20 +0000 (03:02 +0200)]
avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Neil Birkbeck [Sat, 21 Sep 2013 00:25:40 +0000 (17:25 -0700)]
avfilter/vf_psnr: Prevent integer overflow.
The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 20:50:41 +0000 (22:50 +0200)]
avformat/utils: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 20:50:06 +0000 (22:50 +0200)]
avformat/avienc: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 14 Sep 2013 08:59:21 +0000 (05:59 -0300)]
matroskaenc: Add CuePoints for subtitle tracks
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 20 Sep 2013 15:07:18 +0000 (17:07 +0200)]
h264dec: Add .avc file name extension
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Vittorio Giovara [Fri, 20 Sep 2013 15:28:04 +0000 (17:28 +0200)]
h264dec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Martin Storsjö [Fri, 20 Sep 2013 11:02:41 +0000 (14:02 +0300)]
mem: Handle av_reallocp(..., 0) properly
Previously this did a double free (and returned an error).
Reported-by: Justin Ruggles
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 20 Sep 2013 14:08:19 +0000 (16:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: remove an unused static constant
Merge only for metadata as the constant us not unused in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 14:02:17 +0000 (16:02 +0200)]
Merge commit '
33b88f2a4ae54d5397c45e39a5326289ebdc7747 '
* commit '
33b88f2a4ae54d5397c45e39a5326289ebdc7747 ':
msvc/icl: Use __declspec(noinline)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 13:50:59 +0000 (15:50 +0200)]
Merge commit '
09f2581dc5edb3642858d69d9a70b67e249167e9 '
* commit '
09f2581dc5edb3642858d69d9a70b67e249167e9 ':
msvc/icl: Use __declspec(deprecated)
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 13:44:57 +0000 (15:44 +0200)]
Merge commit '
5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91 '
* commit '
5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91 ':
rtmp: Unbreak get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 13:37:55 +0000 (15:37 +0200)]
Merge commit '
a9d50bb578ec04c085a25f1e023f75e0e4499d5e '
* commit '
a9d50bb578ec04c085a25f1e023f75e0e4499d5e ':
dcadec: Validate the lfe parameter
Conflicts:
libavcodec/dcadec.c
See:
3b2cd83a829e01a603b52fdc058a054b7899d06e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 13:30:47 +0000 (15:30 +0200)]
Merge commit '
b97b1adb3f807e1acd00d56319ee6cb41cc727e4 '
* commit '
b97b1adb3f807e1acd00d56319ee6cb41cc727e4 ':
rtmpproto: Add a comment explaining the logic in handle_notify
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 13:23:54 +0000 (15:23 +0200)]
Merge commit '
e5d45e028cf4193b562075897e55091779e49f15 '
* commit '
e5d45e028cf4193b562075897e55091779e49f15 ':
build: Support cparser
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Sep 2013 13:12:21 +0000 (15:12 +0200)]
Michael Niedermayer [Fri, 20 Sep 2013 12:56:00 +0000 (14:56 +0200)]
Michael Niedermayer [Fri, 20 Sep 2013 12:51:02 +0000 (14:51 +0200)]
Merge commit '
83c285f88016b087c2f0f4b9ef356ad8ef12d947 '
* commit '
83c285f88016b087c2f0f4b9ef356ad8ef12d947 ':
wtv: Add more sanity checks for a length read from the file
Conflicts:
libavformat/wtv.c
See:
c42efad3c34cace09555e05fd0cb81cb59cc726f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
Vittorio Giovara [Fri, 20 Sep 2013 11:09:23 +0000 (13:09 +0200)]
h264: remove an unused static constant
Signed-off-by: Martin Storsjö <martin@martin.st>
Alex Smith [Thu, 19 Sep 2013 21:33:23 +0000 (17:33 -0400)]
msvc/icl: Use __declspec(noinline)
Signed-off-by: Martin Storsjö <martin@martin.st>
Alex Smith [Thu, 19 Sep 2013 20:58:21 +0000 (16:58 -0400)]
msvc/icl: Use __declspec(deprecated)
Prior to this on msvc/icl there was no handling of deprecated functions
and the deprecated warning was disabled.
After enabling there are a number of warnings relating to the CRT and
the use of the non-secure versions of several functions. Defining
_CRT_SECURE_NO_WARNINGS silences these warnings.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Fri, 20 Sep 2013 09:55:20 +0000 (11:55 +0200)]
rtmp: Unbreak get_packet
Commit
5626f994f273af80fb100d4743b963304de9e05c broke it.
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>
Martin Storsjö [Thu, 19 Sep 2013 12:12:06 +0000 (15:12 +0300)]
dcadec: Validate the lfe parameter
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
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>
Martin Storsjö [Thu, 19 Sep 2013 09:48:04 +0000 (12:48 +0300)]
rtmpproto: Add a comment explaining the logic in handle_notify
This explains why the cleanup in
5626f994f was wrong and why
ae0f316a was needed.
Signed-off-by: Martin Storsjö <martin@martin.st>
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>