aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec: add C xvid IDCT supportPascal Massimino2014-08-124-1/+352
| | | | | | | | | Thanks to Pascal Massimino and Michael Militzer for permission to use under LGPL The xvid idct code is from xvid, and nearly unchanged to make future syncing easy the integration into ffmpeg is done by the commiter the commit message is written by the commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lsws: duplicate ff_log2_tabJames Almer2014-08-122-0/+3
| | | | | | | | | libswscale uses the table but wasn't duplicating it like the rest of the libs. This should fix compilation failures on msvc/icl after lavu stopped exporting internal functions and tables. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'Michael Niedermayer2014-08-121-16/+16
|\ | | | | | | | | | | | | | | | | | | | | * commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1dec.c See: b05cd1ea7e45a836f7f6071a716c38bb30326e0f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffv1dec: check that global parameters do not change in version 0/1Michael Niedermayer2014-08-121-7/+25
| | | | | | | | | | | | | | | | | | Such changes are neither allowed nor supported Found-by: ami_stuff Bug-Id: CVE-2013-7020 CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3187fa14a326908f9471a038e3b5b24c0eaf655e'Michael Niedermayer2014-08-120-0/+0
|\| | | | | | | | | | | | | | | * commit '3187fa14a326908f9471a038e3b5b24c0eaf655e': hevc_mvs: avoid deriving tmvp in amvp See: 373677f95816924a3790c174e83ec2e378962c44 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_mvs: avoid deriving tmvp in amvpChristophe Gisquet2014-08-121-1/+2
| | | | | | | | | | | | | | | | Reduces the number of calls to tmvp derivation from 933685 to 586271 on a sequence. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'Michael Niedermayer2014-08-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a': hevc: wait proper position for tmvp Conflicts: libavcodec/hevc_mvs.c See: ed248e7f70d98abe099392e154d1cdd0f15faa3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: wait proper position for tmvpChristophe Gisquet2014-08-121-1/+2
| | | | | | | | | | | | | | | | | | The position is either rounded or not checked, so delay the wait to check the proper value. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'Michael Niedermayer2014-08-121-2/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c': hevc: use intreadwrite Conflicts: libavcodec/hevc_mvs.c See: 7a4a5515b0ce97f1c4e18ed012cc3f86328dd220 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: use intreadwriteChristophe Gisquet2014-08-123-18/+13
| | | | | | | | | | | | When dealing with MVs, both components may be processed at a time. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'Michael Niedermayer2014-08-121-8/+16
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc': hevc: derive partial merge list Conflicts: libavcodec/hevc_mvs.c See: 4576eff05d94a5e0b853a7a595d31351cc539e7b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: derive partial merge listChristophe Gisquet2014-08-121-9/+33
| | | | | | | | | | | | The merge list only needs to be derived up to the merge index. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'Michael Niedermayer2014-08-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b': hevc: derive partially amvp list Conflicts: libavcodec/hevc_mvs.c See: bbeaae96eb6fc623f6bfd4a0dd2fd06e6b620938 See: 3ad046083119abd3b063964bd79797e9935305e1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: derive partially amvp listChristophe Gisquet2014-08-121-0/+5
| | | | | | | | | | | | When the candidate has been found, no need to derive others. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '09182b3224370e1d636631e77f201a8388766bd6'Michael Niedermayer2014-08-121-4/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '09182b3224370e1d636631e77f201a8388766bd6': hevc: simplify rounding Conflicts: libavcodec/hevc_mvs.c See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: simplify roundingChristophe Gisquet2014-08-121-4/+4
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574'Michael Niedermayer2014-08-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574': hevc: reorder loops Conflicts: libavcodec/hevc.c See: eca1957c4cbee66a0b1f3dcabaffe68d61885f16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: reorder loopsChristophe Gisquet2014-08-121-6/+6
| | | | | | | | | | | | iterate over memory in a more continuous order Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Remove useless configure option "--enable-sram".Carl Eugen Hoyos2014-08-121-2/+0
| |
* | vp9/x86: fix bug in intra_pred_hd_32x32.Ronald S. Bultje2014-08-121-1/+1
| | | | | | | | | | | | | | | | Fixes mismatch in first keyframe in sample ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still a second mismatch a few frames into the sample. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/dca: remove unused headerJames Almer2014-08-121-60/+0
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/ttadsp: remove an unnecessary movaJames Almer2014-08-121-1/+1
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Check for nanosleep in headers as well, not only in libsMartin Storsjö2014-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | On mingw64 with c++11 support, the link libraries do contain a nanosleep function, while it isn't exposed via the headers. Using check_func_headers instead of a plain check_func fixes this misdetection. Suggested-by: Hendrik Leppkes <h.leppkes@gmail.com> See: [FFmpeg-devel] [PATCH] fix: 'make' with mingw32 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix warning if https protocol was requested but isn't available.Carl Eugen Hoyos2014-08-121-1/+1
| |
* | Check for hevc startcode when muxing into mpeg-ts.Carl Eugen Hoyos2014-08-121-0/+16
| |
* | lavu: stop exporting internal functionsJames Almer2014-08-121-1/+1
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()James Almer2014-08-124-7/+7
| | | | | | | | | | | | | | It was wrongly being exported and used by libavfilter. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: ported lenscorrection filter from frei0rDaniel Oberhoff2014-08-126-0/+248
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresenc_kostya: report buffer overflowChristophe Gisquet2014-08-121-3/+10
| | | | | | | | | | | | | | If the allocated size, despite best efforts, is too small, exit with the appropriate error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresenc_kostya: remove unneeded parametersChristophe Gisquet2014-08-121-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add missing initialization for AVProbeData.Reimar Döffinger2014-08-112-2/+2
| | | | | | | | | | | | This has become necessary since the new mime field was added. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/snow: fix null pointer dereference in cleanup after allocation failureMichael Niedermayer2014-08-111-1/+1
| | | | | | | | | | | | Fixes: snowf.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffyuvdec: fix overread checksMichael Niedermayer2014-08-111-6/+6
| | | | | | | | | | | | Fixes: ffvhuff_f.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened ↵Michael Niedermayer2014-08-111-0/+5
| | | | | | | | | | | | reader Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: stop exporting internal functionsJames Almer2014-08-111-6/+0
| | | | | | | | | | | | | | | | | | | | Except for those currently used by ffserver. Signed-off-by: James Almer <jamrial@gmail.com> Also left some others that seemed used by applications other than ffserver Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: remove obsolete ff_mpegts_parse_* cruftJames Almer2014-08-112-25/+0
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruftJames Almer2014-08-111-4/+0
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: stop exporting internal functions and tablesJames Almer2014-08-111-18/+0
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/idctdsp: move add/put_pixels_clamped_c to headerMichael Niedermayer2014-08-112-41/+41
| | | | | | | | | | | | This allows sharing them with the xvid IDCT Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: do generic validation of bitstreamChristophe Gisquet2014-08-112-0/+24
| | | | | | | | | | | | | | | | After finishing parsing VPS/SPS/PPS/slice header, check remaining bits, and if an overconsumption occurred, report invalid data. Liked-by: BBB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: add missing comma in log message.Ronald S. Bultje2014-08-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: do not crash when flushing without an allocated frameMichael Niedermayer2014-08-111-1/+1
| | | | | | | | | | | | Fixes Ticket3837 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: check av_opt_set for failure in swr_alloc_set_opts()Michael Niedermayer2014-08-111-9/+31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: document the need to configure the context using AVOptionsLuca Barbato2014-08-111-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Fix printf typeMichael Niedermayer2014-08-111-1/+1
| | | | | | | | | | Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'Michael Niedermayer2014-08-101-0/+12
|\| | | | | | | | | | | | | * commit '08b94f160a2c966bb83e32bde0e52246fafa2155': configure: Don't pass MSVC compiler options -M[TD] to armasm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Don't pass MSVC compiler options -M[TD] to armasmMartin Storsjö2014-08-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | The -MD option (for enabling a dynamically linked crt) gets interpreted as a cpp option for generating dependency information (into a file named '-.d', when preprocessing to a pipe). We shouldn't be passing any and all C compiler flags to armasm (which is a plain assembler, only with cpp bolted on via gas-preprocessor), but these are the main conflicting ones. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'Michael Niedermayer2014-08-101-1/+1
|\| | | | | | | | | | | | | * commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94': avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bumpDiego Biurrun2014-08-101-1/+1
| |
* | Remove panscan information in av_frame_copy_props() if resolution changes.Carl Eugen Hoyos2014-08-101-1/+5
| | | | | | | | Fixes ticket #3750.