]>
git.sesse.net Git - ffmpeg/log
Mark Visser [Tue, 18 Jun 2013 21:38:17 +0000 (17:38 -0400)]
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
Mark Visser [Tue, 21 May 2013 20:14:46 +0000 (16:14 -0400)]
added start_number parameter to drawtext to permit an offset to n/frame_num var
Michael Niedermayer [Fri, 14 Jun 2013 13:20:48 +0000 (15:20 +0200)]
avcodec_encode_audio2: fix memleak on last padded frame
Regression introduced by
799f57ac96f9891d1a0f7d6c4b218ed536e8aca5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 11 Apr 2013 16:57:15 +0000 (09:57 -0700)]
mpegts: Enable muxing of SMPTE KLV metadata
Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 13 Jun 2013 22:15:10 +0000 (00:15 +0200)]
vc1_parser: fix parsing of the frame headers in interlaced streams
first_pic_header_flag needs to be set to allow the parsing code to change
some stream parameters, and not error out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 14 Jun 2013 04:53:45 +0000 (06:53 +0200)]
lavfi/spp: fix description.
Timothy Gu [Tue, 11 Jun 2013 23:52:12 +0000 (16:52 -0700)]
doc/general: Make the license status of the Android libraries clearer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Wed, 12 Jun 2013 08:48:57 +0000 (10:48 +0200)]
drawbox: Respect thickness parameter
The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.
Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.
As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 23:54:30 +0000 (01:54 +0200)]
jpeg2000dec: Check compno in get_coc()
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 13 Jun 2013 23:09:11 +0000 (01:09 +0200)]
lavfi/mp: remove mp=spp.
The filter was ported to a native libavfilter filter.
Clément Bœsch [Sat, 11 May 2013 10:03:38 +0000 (12:03 +0200)]
lavfi: add spp filter.
Michael Niedermayer [Thu, 13 Jun 2013 22:35:52 +0000 (00:35 +0200)]
jpeg2000dec: dont set ncomponents to an invalid value
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 13 Jun 2013 21:49:18 +0000 (21:49 +0000)]
lavc: copy AVCodecContext for threads
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 13 Jun 2013 20:11:07 +0000 (22:11 +0200)]
flacdec: Fix used AVCodecContext
Fixes out of array writes with multiple threads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 12:57:00 +0000 (14:57 +0200)]
avutil/timestamp: remove ""
This may fix an error with C++
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 12:51:59 +0000 (14:51 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
4xm: check bitstream_size boundary before using it
Conflicts:
libavcodec/4xm.c
See:
9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 12:38:01 +0000 (14:38 +0200)]
Merge commit '
fbd0dacc8d61ab418b3fa8e7be22017558323e56 '
* commit '
fbd0dacc8d61ab418b3fa8e7be22017558323e56 ':
4xm: refactor decode_p_block
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 12:10:06 +0000 (14:10 +0200)]
Merge commit '
94aefb1932be882fd93f66cf790ceb19ff575c19 '
* commit '
94aefb1932be882fd93f66cf790ceb19ff575c19 ':
4xm: do not overread the source buffer in decode_p_block
Conflicts:
libavcodec/4xm.c
The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 11:56:14 +0000 (13:56 +0200)]
Merge commit '
be373cb50d3c411366fec7eef2eb3681abe48f96 '
* commit '
be373cb50d3c411366fec7eef2eb3681abe48f96 ':
4xm: do not overread the prestream buffer
Conflicts:
libavcodec/4xm.c
See:
9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 11:41:27 +0000 (13:41 +0200)]
Merge commit '
de2e5777e225e75813daf2373c95e223651fd89a '
* commit '
de2e5777e225e75813daf2373c95e223651fd89a ':
4xm: validate the buffer size before parsing it
Conflicts:
libavcodec/4xm.c
See:
9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 11:07:01 +0000 (13:07 +0200)]
Merge commit '
145023f57262d21474e35b4a6069cf95136339d4 '
* commit '
145023f57262d21474e35b4a6069cf95136339d4 ':
4xm: reject frames not compatible with the declared version
See:
c433823750bf096187e70c22822431a7c0bb4202
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 10:57:34 +0000 (12:57 +0200)]
Merge commit '
1f0c6075604c271d5627480f1243d22795f9a315 '
* commit '
1f0c6075604c271d5627480f1243d22795f9a315 ':
4xm: drop pointless assert
Conflicts:
libavcodec/4xm.c
The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to
av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 10:21:36 +0000 (12:21 +0200)]
Merge commit '
b8b809908ec547b2609dbac24194f4fd2df61aea '
* commit '
b8b809908ec547b2609dbac24194f4fd2df61aea ':
4xm: forward errors from decode_p_block
Conflicts:
libavcodec/4xm.c
Impossible to be false check has been replaced by av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 10:10:05 +0000 (12:10 +0200)]
Merge commit '
50ec1db62d977b6e864f315a53c1c580a6d7efa4 '
* commit '
50ec1db62d977b6e864f315a53c1c580a6d7efa4 ':
4xm: fold last_picture lazy allocation in decode_p_frame
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 09:56:31 +0000 (11:56 +0200)]
Merge commit '
42d73f7f6bea0ee0f64a3ad4882860ce5b923a11 '
* commit '
42d73f7f6bea0ee0f64a3ad4882860ce5b923a11 ':
4xm: do not overread while parsing header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 08:08:50 +0000 (10:08 +0200)]
Merge commit '
e7a44f87d07655ec0cd31c315936931674434340 '
* commit '
e7a44f87d07655ec0cd31c315936931674434340 ':
4xm: refactor fourxm_read_header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 07:50:42 +0000 (09:50 +0200)]
Merge commit '
e6496ea7e7ea7355167a1ccbe67a7199d446a654 '
* commit '
e6496ea7e7ea7355167a1ccbe67a7199d446a654 ':
4xm: K&R formatting cosmetics
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Jun 2013 07:41:27 +0000 (09:41 +0200)]
Merge commit '
08859d19b429c522d6494c186656f4a2d3ff8e21 '
* commit '
08859d19b429c522d6494c186656f4a2d3ff8e21 ':
4xm: use the correct logging context
g2meet: Fix a typo in the height comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Jun 2013 22:46:15 +0000 (00:46 +0200)]
h264: Try parsing SPS as complete NAL in more cases
Fixes Ticket2580
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 12 Jun 2013 23:29:23 +0000 (01:29 +0200)]
require --enable-gpl for using the frei0r filter
frei0r license is GPL.
Based on a patch by Timothy Gu <timothygu99@gmail.com>.
See thread:
Subject: [FFmpeg-devel] [PATCH 1/2] LICENSE: Complete GPL'd external libraries list
Date: Thu, 6 Jun 2013 18:55:30 -0700
Stefano Sabatini [Tue, 11 Jun 2013 14:02:39 +0000 (16:02 +0200)]
lavfi/rotate: add angle command
Stefano Sabatini [Wed, 12 Jun 2013 15:24:44 +0000 (17:24 +0200)]
tests: add filter-pixfmts-rotate test
Stefano Sabatini [Tue, 11 Jun 2013 08:31:59 +0000 (10:31 +0200)]
lavfi: add rotate filter
Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height
Address trac issue #1500.
See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT
Timothy Gu [Tue, 11 Jun 2013 23:58:01 +0000 (16:58 -0700)]
doc/encoders: Add libvo-amrwbenc doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Jun 2013 14:16:59 +0000 (16:16 +0200)]
alacenc: Fix missing sign_extend()
Possibly fixes Ticket2497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 10 Jun 2013 14:37:43 +0000 (16:37 +0200)]
4xm: check bitstream_size boundary before using it
Prevent buffer overread.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 9 Jun 2013 19:50:57 +0000 (21:50 +0200)]
4xm: refactor decode_p_block
Directly return from code 1, 2 and 6 codepaths and simplify the
remaining one to have a single overflow check and a single call to
mcdc.
Luca Barbato [Sun, 9 Jun 2013 16:27:05 +0000 (18:27 +0200)]
4xm: do not overread the source buffer in decode_p_block
Check for out of picture macroblocks before calling mcdc.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 7 Jun 2013 14:18:22 +0000 (16:18 +0200)]
4xm: do not overread the prestream buffer
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 7 Jun 2013 14:16:46 +0000 (16:16 +0200)]
4xm: validate the buffer size before parsing it
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Thu, 6 Jun 2013 14:58:57 +0000 (16:58 +0200)]
4xm: reject frames not compatible with the declared version
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Thu, 6 Jun 2013 12:21:19 +0000 (14:21 +0200)]
4xm: drop pointless assert
Make sure the value of wlog2 is always between 0 and 3.
Luca Barbato [Wed, 5 Jun 2013 20:33:34 +0000 (22:33 +0200)]
4xm: forward errors from decode_p_block
Partially mitigate out of memory writes.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 5 Jun 2013 18:30:48 +0000 (20:30 +0200)]
4xm: fold last_picture lazy allocation in decode_p_frame
Luca Barbato [Wed, 5 Jun 2013 16:56:28 +0000 (18:56 +0200)]
4xm: do not overread while parsing header
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 5 Jun 2013 16:45:45 +0000 (18:45 +0200)]
4xm: refactor fourxm_read_header
Split sound and video tag parsing in separate functions.
Luca Barbato [Wed, 5 Jun 2013 15:32:49 +0000 (17:32 +0200)]
4xm: K&R formatting cosmetics
Luca Barbato [Wed, 5 Jun 2013 15:12:16 +0000 (17:12 +0200)]
4xm: use the correct logging context
Michael Niedermayer [Sun, 9 Jun 2013 14:55:10 +0000 (16:55 +0200)]
g2meet: Fix a typo in the height comparison
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 12 Jun 2013 09:53:27 +0000 (11:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g2meet: do not leak buffers
g2meet: more graceful cursor loading
g2meet: reset dimensions on header parsing errors
Conflicts:
libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Tue, 11 Jun 2013 17:09:38 +0000 (19:09 +0200)]
g2meet: do not leak buffers
Kostya Shishkov [Tue, 11 Jun 2013 17:07:38 +0000 (19:07 +0200)]
g2meet: more graceful cursor loading
Kostya Shishkov [Tue, 11 Jun 2013 16:34:26 +0000 (18:34 +0200)]
g2meet: reset dimensions on header parsing errors
James Almer [Tue, 11 Jun 2013 08:03:55 +0000 (05:03 -0300)]
fate: Add test vectors for HMAC SHA and SHA-2
Also replace custom tests for MD5 with those published in RFC 2202
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 10 Jun 2013 20:24:47 +0000 (17:24 -0300)]
lavu/hmac: Add support for SHA-2
Includes HMAC-SHA-224, HMAC-SHA-256, HMAC-SHA-384, and HMAC-SHA-512.
Tested using test vectors from https://tools.ietf.org/html/rfc4231
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexandre Sicard [Tue, 11 Jun 2013 09:06:38 +0000 (11:06 +0200)]
avformat/mov: ignore samples overflowing next_root_atom
This fixes #2657.
ISML movies produced by Microsoft Expression Encoder 4 seem to have invalid
sample entries in their trun/tfhd for data tracks. As a result, too much bytes
are read for these tracks to the point that next_root_atom can go out of
buffer, which makes the encoding fail if the input is not seekable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 11 Jun 2013 20:53:21 +0000 (20:53 +0000)]
doc/general: s/Libav/FFmpeg
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 11 Jun 2013 20:50:42 +0000 (20:50 +0000)]
fate: wavpack: add more dependencies
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 11 Jun 2013 07:36:01 +0000 (09:36 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add a libwavpack encoder wrapper
Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Jun 2013 07:23:11 +0000 (09:23 +0200)]
Merge commit '
799f57ac96f9891d1a0f7d6c4b218ed536e8aca5 '
* commit '
799f57ac96f9891d1a0f7d6c4b218ed536e8aca5 ':
lavc: use AVFrame API properly in pad_last_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Jun 2013 07:16:13 +0000 (09:16 +0200)]
Merge commit '
8835c554ff506992c47f6e347c74216ae073f0fa '
* commit '
8835c554ff506992c47f6e347c74216ae073f0fa ':
matroskadec: introduce resync function.
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Jun 2013 06:53:31 +0000 (08:53 +0200)]
Merge commit '
3965d404ccd9b6cac95c4aee6cb668845031b685 '
* commit '
3965d404ccd9b6cac95c4aee6cb668845031b685 ':
configure: Don't add -fPIC on windows targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Jun 2013 06:38:11 +0000 (08:38 +0200)]
Merge commit '
3fd0d166aa240ef547482d1af397c4a653031c2d '
* commit '
3fd0d166aa240ef547482d1af397c4a653031c2d ':
configure: Don't explicitly disable PIC for windows targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Jun 2013 06:27:50 +0000 (08:27 +0200)]
Merge commit '
2aa3325454545b63cd63e3d5884f8558790d51df '
* commit '
2aa3325454545b63cd63e3d5884f8558790d51df ':
configure: arm: Don't try to enable pic for shared libraries on win32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Jun 2013 00:07:00 +0000 (02:07 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Jun 2013 22:33:27 +0000 (00:33 +0200)]
avcodec/utils: Fix encoder allocation size
Fixes Ticket2645
Found-by: Darrell Walisser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 10 Jun 2013 23:04:49 +0000 (01:04 +0200)]
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
This makes the conversion function more robust.
Stefano Sabatini [Fri, 15 Apr 2011 14:14:22 +0000 (16:14 +0200)]
doc/metadata: add notes and examples regarding metadata usage with ffmpeg
Michael Niedermayer [Mon, 10 Jun 2013 20:00:43 +0000 (22:00 +0200)]
vf_sab: Fix memleak
Fixes CID1030353
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 25 May 2013 17:22:59 +0000 (19:22 +0200)]
lavc: add a libwavpack encoder wrapper
Anton Khirnov [Tue, 4 Jun 2013 17:01:22 +0000 (19:01 +0200)]
lavc: use AVFrame API properly in pad_last_frame().
This also simplifies the code.
Sean McGovern [Mon, 27 May 2013 22:11:50 +0000 (18:11 -0400)]
matroskadec: introduce resync function.
This allows handling matroska files with errors.
Fixes test4.mkv and test7.mkv from the official Matroska test suite,
and by extension Bugzilla #62.
Based on a patch by Reimar Doffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sat, 8 Jun 2013 22:36:04 +0000 (00:36 +0200)]
jpeg2000dec: Check bpno in decode_cblk()
Fixes integer overflow in fate-redcode-demux
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Jun 2013 14:12:32 +0000 (16:12 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Accept incomplete http cookies without domain.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Jun 2013 14:00:59 +0000 (16:00 +0200)]
(lib)utvideodec: remove setting of color_primaries
Thanks-to: Paranoialmaniac
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 5 Jun 2013 11:51:28 +0000 (14:51 +0300)]
configure: Don't add -fPIC on windows targets
This avoids warnings about this option not having any effect on
this platform.
We still want to enable the pic configure item for these platforms
(if detected via the compiler builtin define __PIC__) to get proper
inline assembly workarounds.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 28 May 2013 12:10:37 +0000 (15:10 +0300)]
configure: Don't explicitly disable PIC for windows targets
This reverts
e08c946c6 and
05165c2f7a . The actual intention of
e08c946c6 was to fix shared library builds for arm/win32, which
can also be accomplished in other ways.
Disabling pic on those platforms broke inline assembly on cygwin/64
(since some inline assembly requires knowing whether we are building
as PIC or not), and might also break inline assembly on other
compilers on windows.
As a side-effect, this unfortunately brings back all the warnings
about PIC not having any effect on that platform.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 28 May 2013 12:08:57 +0000 (15:08 +0300)]
configure: arm: Don't try to enable pic for shared libraries on win32
The object file format doesn't support PIC loads in ARM assembly,
there are no relocation types in PE/COFF that correspond to
BFD_RELOC_32_PCREL (R_ARM_REL32 in ELF).
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Mon, 10 Jun 2013 08:52:40 +0000 (10:52 +0200)]
Accept incomplete http cookies without domain.
Works around a bug in some servers that apparently send incomplete cookies.
Fixes a part of ticket #2619.
Reviewed-by: Micah Galizia
Michael Niedermayer [Mon, 10 Jun 2013 08:41:57 +0000 (10:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideodec: Set colorspace by codec_tag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Jun 2013 08:33:43 +0000 (10:33 +0200)]
Merge commit '
2578f1efd64f4efc30114c328d1eff9030429e59 '
* commit '
2578f1efd64f4efc30114c328d1eff9030429e59 ':
riff: Support ULH0 and ULH2 fourccs.
utvideodec: Support ULH0 and ULH2 formats.
Conflicts:
libavcodec/utvideodec.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Sun, 9 Jun 2013 12:08:04 +0000 (08:08 -0400)]
utvideo: Add ULH0 and ULH2 decoding to the native decoder.
Also prevents an error since the native decoder (if enabled) is
always used to probe Ut Video-encoded files, even if the user
forces libutvideo to be the decoder. Without this patch, the probe
would fail, and the video wouldn't get properly handed over,
resulting in failure to set codec parameters. When the native
decoder is disabled, libutvideo can probe and initialize decoding
without issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Sun, 9 Jun 2013 12:08:03 +0000 (08:08 -0400)]
libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Yusuke Nakamura [Sat, 8 Jun 2013 15:16:27 +0000 (00:16 +0900)]
utvideodec: Set colorspace by codec_tag.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Yusuke Nakamura [Sat, 8 Jun 2013 14:54:41 +0000 (23:54 +0900)]
riff: Support ULH0 and ULH2 fourccs.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Yusuke Nakamura [Sat, 8 Jun 2013 14:23:16 +0000 (23:23 +0900)]
utvideodec: Support ULH0 and ULH2 formats.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Michael Niedermayer [Mon, 10 Jun 2013 01:34:33 +0000 (03:34 +0200)]
swscale/swscale_unscaled: add ()
Fixes order of operations
Fixes CID1030350
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Jun 2013 00:46:03 +0000 (02:46 +0200)]
swresample/rematrix_template: Fix integer overflow in mix8to2
Fixes: CID1030352
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Jun 2013 00:39:48 +0000 (02:39 +0200)]
swresample/rematrix_template: Fix integer overflow in mix6to2
Fixes: CID1030351
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 9 Jun 2013 17:25:43 +0000 (19:25 +0200)]
Insert a newline before showing embedded svq1 messages.
Messages may start with a carriage return.
Michael Niedermayer [Sun, 9 Jun 2013 15:25:39 +0000 (17:25 +0200)]
id2v2: check the return value of decode_str()
Fixes CID1030348
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Jun 2013 14:55:10 +0000 (16:55 +0200)]
g2meet: fix typo in height comparission
Fixes CID1030349
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Jun 2013 09:59:57 +0000 (11:59 +0200)]
g2meet: Check cursor parameters before writing them in the context
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Jun 2013 00:29:35 +0000 (02:29 +0200)]
avcodec/g2meet: check framebuf has been allocated before use
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 8 Jun 2013 23:10:36 +0000 (01:10 +0200)]
Support decoding G.722 in aiff.
Clément Bœsch [Sat, 8 Jun 2013 21:23:28 +0000 (23:23 +0200)]
lavfi/pp: set out frame size.
w/h from input frame are not copied in av_frame_copy_props(). This
commit avoids a mismatch between aligned_[wh] and outbuf->{width,height}
(and thus avoids triggering an assert in avfilter because of this).
Michael Niedermayer [Sat, 8 Jun 2013 17:22:34 +0000 (19:22 +0200)]
avformat/wavdec: Dont rescale timestamps but use exact comparission
Fixes integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Jun 2013 18:00:16 +0000 (20:00 +0200)]
smvjpegdec: No frame at all is an error
This fixes a infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 8 Jun 2013 17:38:32 +0000 (17:38 +0000)]
wavpack: add missing .\n to entropy error message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 7 Jun 2013 10:06:15 +0000 (10:06 +0000)]
matroskadec: move ALAC extradata creation bellow AAC one
Signed-off-by: Paul B Mahol <onemda@gmail.com>