Michael Niedermayer
60657ee37a
Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'
...
* commit 'e7a44f87d07655ec0cd31c315936931674434340':
4xm: refactor fourxm_read_header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-13 10:08:50 +02:00
Michael Niedermayer
90c8863a74
Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'
...
* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
4xm: K&R formatting cosmetics
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-13 09:50:42 +02:00
Michael Niedermayer
5c3e5651dd
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>
2013-06-13 09:41:45 +02:00
Michael Niedermayer
443b29e475
h264: Try parsing SPS as complete NAL in more cases
...
Fixes Ticket2580
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-13 01:43:09 +02:00
Stefano Sabatini
28aed88b73
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
2013-06-13 01:40:24 +02:00
Stefano Sabatini
e0135a4bcd
lavfi/rotate: add angle command
2013-06-13 01:21:47 +02:00
Stefano Sabatini
6397264e84
tests: add filter-pixfmts-rotate test
2013-06-13 01:21:47 +02:00
Stefano Sabatini
dc5e26d67f
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
2013-06-13 01:21:47 +02:00
Timothy Gu
0ec65aa104
doc/encoders: Add libvo-amrwbenc doc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-12 23:37:35 +02:00
Michael Niedermayer
8aea2f05dc
alacenc: Fix missing sign_extend()
...
Possibly fixes Ticket2497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-12 16:23:49 +02:00
Luca Barbato
59d7bb99b6
4xm: check bitstream_size boundary before using it
...
Prevent buffer overread.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-12 14:45:46 +02:00
Luca Barbato
fbd0dacc8d
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.
2013-06-12 14:45:46 +02:00
Luca Barbato
94aefb1932
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
2013-06-12 14:45:46 +02:00
Luca Barbato
be373cb50d
4xm: do not overread the prestream buffer
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-12 14:45:46 +02:00
Luca Barbato
de2e5777e2
4xm: validate the buffer size before parsing it
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-12 14:45:46 +02:00
Luca Barbato
145023f572
4xm: reject frames not compatible with the declared version
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-12 14:45:46 +02:00
Luca Barbato
1f0c607560
4xm: drop pointless assert
...
Make sure the value of wlog2 is always between 0 and 3.
2013-06-12 14:45:46 +02:00
Luca Barbato
b8b809908e
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
2013-06-12 14:45:46 +02:00
Luca Barbato
50ec1db62d
4xm: fold last_picture lazy allocation in decode_p_frame
2013-06-12 14:45:46 +02:00
Luca Barbato
42d73f7f6b
4xm: do not overread while parsing header
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-06-12 14:45:46 +02:00
Luca Barbato
e7a44f87d0
4xm: refactor fourxm_read_header
...
Split sound and video tag parsing in separate functions.
2013-06-12 14:45:46 +02:00
Luca Barbato
e6496ea7e7
4xm: K&R formatting cosmetics
2013-06-12 14:45:46 +02:00
Luca Barbato
08859d19b4
4xm: use the correct logging context
2013-06-12 14:45:46 +02:00
Michael Niedermayer
7ad5708691
g2meet: Fix a typo in the height comparison
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-06-12 13:45:53 +02:00
Michael Niedermayer
d3c4ea8b35
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>
2013-06-12 11:53:27 +02:00
Kostya Shishkov
7dfc3381dd
g2meet: do not leak buffers
2013-06-12 09:54:45 +02:00
Kostya Shishkov
4d960d7f60
g2meet: more graceful cursor loading
2013-06-12 09:54:45 +02:00
Kostya Shishkov
767ae86cee
g2meet: reset dimensions on header parsing errors
2013-06-12 09:54:45 +02:00
James Almer
1163910a00
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>
2013-06-12 01:48:23 +02:00
James Almer
82ef67016e
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>
2013-06-12 01:47:42 +02:00
Alexandre Sicard
b1d61eb7aa
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>
2013-06-12 00:51:38 +02:00
Paul B Mahol
df084adbf7
doc/general: s/Libav/FFmpeg
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-11 20:53:21 +00:00
Paul B Mahol
0354bc39eb
fate: wavpack: add more dependencies
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-11 20:50:42 +00:00
Michael Niedermayer
73d5cf8f43
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>
2013-06-11 09:36:34 +02:00
Michael Niedermayer
5d199c3ad9
Merge commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5'
...
* commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5':
lavc: use AVFrame API properly in pad_last_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-11 09:27:04 +02:00
Michael Niedermayer
045e371cf1
Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'
...
* commit '8835c554ff506992c47f6e347c74216ae073f0fa':
matroskadec: introduce resync function.
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-11 09:16:13 +02:00
Michael Niedermayer
529ebc90f2
Merge commit '3965d404ccd9b6cac95c4aee6cb668845031b685'
...
* commit '3965d404ccd9b6cac95c4aee6cb668845031b685':
configure: Don't add -fPIC on windows targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-11 08:53:37 +02:00
Michael Niedermayer
f556f27d29
Merge commit '3fd0d166aa240ef547482d1af397c4a653031c2d'
...
* commit '3fd0d166aa240ef547482d1af397c4a653031c2d':
configure: Don't explicitly disable PIC for windows targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-11 08:38:16 +02:00
Michael Niedermayer
1603c9bd9c
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>
2013-06-11 08:28:00 +02:00
Michael Niedermayer
0f88a98b43
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-11 02:07:08 +02:00
Michael Niedermayer
175e916fa2
avcodec/utils: Fix encoder allocation size
...
Fixes Ticket2645
Found-by: Darrell Walisser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-11 01:15:39 +02:00
Carl Eugen Hoyos
7800b09ece
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
...
This makes the conversion function more robust.
2013-06-11 01:14:38 +02:00
Stefano Sabatini
57655c6080
doc/metadata: add notes and examples regarding metadata usage with ffmpeg
2013-06-11 01:07:16 +02:00
Michael Niedermayer
d3e89f2641
vf_sab: Fix memleak
...
Fixes CID1030353
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10 22:00:43 +02:00
Anton Khirnov
84d3ff50cd
lavc: add a libwavpack encoder wrapper
2013-06-10 21:33:48 +02:00
Anton Khirnov
799f57ac96
lavc: use AVFrame API properly in pad_last_frame().
...
This also simplifies the code.
2013-06-10 21:19:51 +02:00
Sean McGovern
8835c554ff
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>
2013-06-10 20:51:35 +02:00
Michael Niedermayer
8e887ca1fe
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>
2013-06-10 17:13:46 +02:00
Michael Niedermayer
d5caf10c4f
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Accept incomplete http cookies without domain.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10 16:12:37 +02:00
Michael Niedermayer
e473f7e659
(lib)utvideodec: remove setting of color_primaries
...
Thanks-to: Paranoialmaniac
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10 16:00:59 +02:00