aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* alacenc: Fix missing sign_extend()Michael Niedermayer2013-06-121-1/+1
| | | | | | Possibly fixes Ticket2497 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-121-29/+67
|\ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * g2meet: do not leak buffersKostya Shishkov2013-06-121-0/+2
| |
| * g2meet: more graceful cursor loadingKostya Shishkov2013-06-121-18/+53
| |
| * g2meet: reset dimensions on header parsing errorsKostya Shishkov2013-06-121-5/+12
| |
* | fate: Add test vectors for HMAC SHA and SHA-2James Almer2013-06-122-13/+63
| | | | | | | | | | | | | | 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>
* | lavu/hmac: Add support for SHA-2James Almer2013-06-123-7/+57
| | | | | | | | | | | | | | | | 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>
* | avformat/mov: ignore samples overflowing next_root_atomAlexandre Sicard2013-06-121-0/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | doc/general: s/Libav/FFmpegPaul B Mahol2013-06-111-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate: wavpack: add more dependenciesPaul B Mahol2013-06-111-27/+27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-118-2/+241
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add a libwavpack encoder wrapper Conflicts: Changelog doc/encoders.texi libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a libwavpack encoder wrapperAnton Khirnov2013-06-108-2/+241
| |
* | Merge commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5'Michael Niedermayer2013-06-111-15/+9
|\| | | | | | | | | | | | | * commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5': lavc: use AVFrame API properly in pad_last_frame(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use AVFrame API properly in pad_last_frame().Anton Khirnov2013-06-101-15/+8
| | | | | | | | This also simplifies the code.
* | Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'Michael Niedermayer2013-06-111-8/+7
|\| | | | | | | | | | | | | | | | | | | * commit '8835c554ff506992c47f6e347c74216ae073f0fa': matroskadec: introduce resync function. Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: introduce resync function.Sean McGovern2013-06-101-4/+43
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '3965d404ccd9b6cac95c4aee6cb668845031b685'Michael Niedermayer2013-06-111-1/+7
|\| | | | | | | | | | | | | * commit '3965d404ccd9b6cac95c4aee6cb668845031b685': configure: Don't add -fPIC on windows targets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Don't add -fPIC on windows targetsMartin Storsjö2013-06-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '3fd0d166aa240ef547482d1af397c4a653031c2d'Michael Niedermayer2013-06-111-3/+0
|\| | | | | | | | | | | | | * commit '3fd0d166aa240ef547482d1af397c4a653031c2d': configure: Don't explicitly disable PIC for windows targets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Don't explicitly disable PIC for windows targetsMartin Storsjö2013-06-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '2aa3325454545b63cd63e3d5884f8558790d51df'Michael Niedermayer2013-06-111-1/+1
|\| | | | | | | | | | | | | * commit '2aa3325454545b63cd63e3d5884f8558790d51df': configure: arm: Don't try to enable pic for shared libraries on win32 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: arm: Don't try to enable pic for shared libraries on win32Martin Storsjö2013-06-101-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-111-1/+2
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()Carl Eugen Hoyos2013-06-111-1/+2
| | | | | | | | | | | | This makes the conversion function more robust.
* | | avcodec/utils: Fix encoder allocation sizeMichael Niedermayer2013-06-111-1/+1
|/ / | | | | | | | | | | Fixes Ticket2645 Found-by: Darrell Walisser Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/metadata: add notes and examples regarding metadata usage with ffmpegStefano Sabatini2013-06-111-0/+16
| |
* | vf_sab: Fix memleakMichael Niedermayer2013-06-101-1/+3
| | | | | | | | | | Fixes CID1030353 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: Check bpno in decode_cblk()Michael Niedermayer2013-06-101-0/+4
| | | | | | | | | | | | | | Fixes integer overflow in fate-redcode-demux Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-101-0/+2
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Accept incomplete http cookies without domain. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Accept incomplete http cookies without domain.Carl Eugen Hoyos2013-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | Works around a bug in some servers that apparently send incomplete cookies. Fixes a part of ticket #2619. Reviewed-by: Micah Galizia
* | | (lib)utvideodec: remove setting of color_primariesMichael Niedermayer2013-06-102-4/+0
|/ / | | | | | | | | Thanks-to: Paranoialmaniac Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-101-2/+4
|\| | | | | | | | | | | | | * qatar/master: utvideodec: Set colorspace by codec_tag. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utvideodec: Set colorspace by codec_tag.Yusuke Nakamura2013-06-101-0/+4
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge commit '2578f1efd64f4efc30114c328d1eff9030429e59'Michael Niedermayer2013-06-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * riff: Support ULH0 and ULH2 fourccs.Yusuke Nakamura2013-06-101-0/+2
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * utvideodec: Support ULH0 and ULH2 formats.Yusuke Nakamura2013-06-101-0/+8
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | utvideo: Add ULH0 and ULH2 decoding to the native decoder.Stephen Hutchinson2013-06-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1Stephen Hutchinson2013-06-104-3/+31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_unscaled: add ()Michael Niedermayer2013-06-101-1/+1
| | | | | | | | | | | | | | Fixes order of operations Fixes CID1030350 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/rematrix_template: Fix integer overflow in mix8to2Michael Niedermayer2013-06-101-1/+1
| | | | | | | | | | Fixes: CID1030352 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample/rematrix_template: Fix integer overflow in mix6to2Michael Niedermayer2013-06-101-1/+1
| | | | | | | | | | Fixes: CID1030351 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Insert a newline before showing embedded svq1 messages.Carl Eugen Hoyos2013-06-091-1/+1
| | | | | | | | Messages may start with a carriage return.
* | id2v2: check the return value of decode_str()Michael Niedermayer2013-06-091-1/+2
| | | | | | | | | | Fixes CID1030348 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g2meet: fix typo in height comparissionMichael Niedermayer2013-06-091-1/+1
| | | | | | | | | | Fixes CID1030349 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g2meet: Check cursor parameters before writing them in the contextMichael Niedermayer2013-06-091-5/+11
| | | | | | | | | | | | | | Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: check framebuf has been allocated before useMichael Niedermayer2013-06-091-1/+1
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding G.722 in aiff.Carl Eugen Hoyos2013-06-092-0/+2
| |
* | lavfi/pp: set out frame size.Clément Bœsch2013-06-081-0/+2
| | | | | | | | | | | | 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).
* | avformat/wavdec: Dont rescale timestamps but use exact comparissionMichael Niedermayer2013-06-081-3/+3
| | | | | | | | | | | | Fixes integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smvjpegdec: No frame at all is an errorMichael Niedermayer2013-06-081-0/+2
| | | | | | | | | | | | This fixes a infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>