summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Define ff_log2_run[] in libavcodec/internal.h.Carl Eugen Hoyos2014-03-10
| | | | | This avoids defining the array with different sizes in different source files.
* Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'Michael Niedermayer2014-03-09
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '4d33873c2990b8d6096f60fef384f0efc4482b55': hevc: make pps/sps ids unsigned where necessary Conflicts: libavcodec/hevc.h libavcodec/hevc_ps.c See: d1e6602665d5ec1b7e211ab27b298c26139f82cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: make pps/sps ids unsigned where necessaryVittorio Giovara2014-03-09
| | | | | | | | | | Fixes integer overflow and out of array accesses. Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
* | Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e': hevc: Do not turn 32bit timebases into negative numbers Conflicts: libavcodec/hevc.c See: bf2ce19e51fde57727a4ee33a4b3c2622f37a5c4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: Do not turn 32bit timebases into negative numbersMichael Niedermayer2014-03-09
| | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * hevc: use av_mallocz() for allocating tab_ipmMichael Niedermayer2014-03-09
| | | | | | | | | | Fixes use of uninitialized memory and out of stack array read. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * hevc: Use get_bits_long() in decode_vui()Michael Niedermayer2014-03-09
| | | | | | | | | | Fix assertion failure. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '634d9d8b398982647b3d7160641198744901d8d8'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit '634d9d8b398982647b3d7160641198744901d8d8': arm: get_cabac inline asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: get_cabac inline asmJanne Grunau2014-03-09
| | | | | | | | | | | | | | | | | | | | Based on the aarch64 asm. CPU cycle counts on cortex-a9 compared to gcc 4.8.2: before: 475 decicycles in get_cabac_noinline, 67106035 runs, 2829 skips after: 393 decicycles in get_cabac_noinline, 67106474 runs, 2390 skips Overall speedup is above 2%. Code generated by clang 3.4 is slower on the same hardware and the relative change is a little larger.
* | Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit 'dfe224f377be3e45758c69d881ca7874b82d647a': aarch64: get_cabac inline asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: get_cabac inline asmJanne Grunau2014-03-09
| | | | | | | | | | | | | | Based on the x86 branchless get_cabac asm. get_cabac_noinline() gets approximately 20% faster (no cycle counts available) compared to clang from Xcode 5.1 beta5. More than 6% faster overall. A part of the overall speedup might be explained by additional inlining of get_cabac().
* | Merge commit '4506a854a4d846692ba71daeeff661dc214c8fa2'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | * commit '4506a854a4d846692ba71daeeff661dc214c8fa2': arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declarationJanne Grunau2014-03-09
| | | | | | | | | | Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating clear_blocks into the idct.
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-03-09
|\ \ | | | | | | | | | | | | | | | | | | | | | * cus/stable: libzvbi-teletextdec: split dvb packet to slices libzvbi-teletextdec: use av_dlog where possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | libzvbi-teletextdec: split dvb packet to slicesMarton Balint2014-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the demux function of libzvbi to split the packet to slices (vbi lines), lets do it ourselves. - eliminates the 1 frame delay between page input and output - handles non-ascending line numbers more gracefully - enables us to return error codes on some invalid packets instead of silently ignoring them Signed-off-by: Marton Balint <cus@passwd.hu>
| * | libzvbi-teletextdec: use av_dlog where possibleMarton Balint2014-03-08
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'Michael Niedermayer2014-03-09
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * commit '61985ad72c47bbb668f2d3923bf5c9df83e79323': arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6Janne Grunau2014-03-08
| | | | | | | | | | | | | | | | | | | | | | | | The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41 broke the computation for the last row since it prevented the safe reading from the height+1-th row. CC: libav-stable@libav.org
* | | Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c09532672d7d3196ec52afefa2c96633bc17b62': rv10: K&R formatting cosmetics Conflicts: libavcodec/rv10.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rv10: K&R formatting cosmeticsKeiji Costantini2014-03-08
| | | | | | | | | | | | | | | | | | Also sort #includes into canonical order. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | | Merge commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13'Michael Niedermayer2014-03-09
|\| | | | | | | | | | | | | | | | | | | | * commit 'b4d372e091f6b30758db2a43a5a9fe2510ec2b13': rv10: Forward error from rv10_decode_packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rv10: Forward error from rv10_decode_packetKeiji Costantini2014-03-08
| | | | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | | Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'Michael Niedermayer2014-03-09
|\| | | |/ |/| | | | | | | | | | | | | | | * commit 'a801453423420915425f902bf9f9cbe982a55d87': g2meet: K&R formatting cosmetics Conflicts: libavcodec/g2meet.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: K&R formatting cosmeticsDiego Biurrun2014-03-08
| |
* | lavc/pthread: copy packet side data.Nicolas George2014-03-08
| |
* | avcodec/vorbis: fix decoding of single element huffman treesMichael Niedermayer2014-03-08
| | | | | | | | | | | | Fixes Ticket2893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()Michael Niedermayer2014-03-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/wmadec: initialize max_exponent to valid valuesMichael Niedermayer2014-03-08
| | | | | | | | | | | | Fixes generation of NaN output Fixes: nan_example.wma Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-08
|\| | | | | | | | | | | | | * qatar/master: fic: Properly handle skip frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fic: Properly handle skip framesDerek Buitenhuis2014-03-07
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * libx265: Support API version 9Derek Buitenhuis2014-03-06
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | dxva2_vc1: include the start code in wMBbitOffsetHendrik Leppkes2014-03-07
| | | | | | | | | | | | This resolves a decoding failure on Intel GPUs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_vc1: fix intensity compensation condition with interlaced fieldsHendrik Leppkes2014-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_h264: add a workaround for old intel GPUsHendrik Leppkes2014-03-07
| | | | | | | | | | | | | | | | | | | | Old Intel GPUs expect the reference frame index to the actual surface, instead of the index into RefFrameList as specified by the spec. This workaround should be set when using one of the "ClearVideo" decoder devices. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_h264: set the correct ref frame index in the long slice structHendrik Leppkes2014-03-07
| | | | | | | | | | | | | | | | | | | | The latest H.264 DXVA specification states that the index in this structure should refer to a valid entry in the RefFrameList of the picture parameter structure, and not to the actual surface index. Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | * commit 'b66382101cff33e2ce66500327a90d0a105eedeb': dxva2: Increase maximum number of slices for mpeg2 See: bceeccc648baf94a02b7b2c53e44bf77a47773ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Increase maximum number of slices for mpeg2Rainer Hochecker2014-03-06
| | | | | | | | | | | | | | | | | | Some content requires an higher number of slices in order to render properly. Rise the number to 1024 and warn if ever it exceeds. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | * commit 'd48430c367947a64647c6959cf472f2c01778b17': build: Let the SVQ3 decoder depend on the H.264 decoder Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let the SVQ3 decoder depend on the H.264 decoderDiego Biurrun2014-03-06
| | | | | | | | | | | | | | The SVQ3 decoder reuses large parts of the H.264 decoder so it makes no sense to enable the former but not the latter. Also drop unnecessary h263.o object from SVQ3 decoder object list.
* | Fix spelling error 'Inconsistant -> Inconsistent'Andreas Cadhalpun2014-03-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()James Almer2014-03-06
| | | | | | | | | | | | | | | | Also undo the changes to ra144enc.c from previous commits. Should fix ticket #3429 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx265: Use ctx->vui. instead of ctx-> for some options A recent change in ↵sfan52014-03-06
| | | | | | | | | | | | | | libx265 moved some options such as sar_width into a 'vui' struct. Signed-off-by: sfan5 <sfan5@live.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '3bfdee00cd92ff07c364d4901c4aefda32780756': x86: dcadsp: Fix linking with yasm and optimizations disabled Conflicts: libavcodec/x86/dcadsp_init.c See: 206167a295a5c28cec3c38f7308835b0b7e0618f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dcadsp: Fix linking with yasm and optimizations disabledDiego Biurrun2014-03-05
| | | | | | | | | | Some optimized functions reference optimized symbols, so the functions must be explicitly disabled when those symbols are unavailable.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-05
|\| | | | | | | | | | | | | * qatar/master: arm: hpeldsp: prevent overreads in armv6 asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: hpeldsp: prevent overreads in armv6 asmJanne Grunau2014-03-05
| | | | | | | | | | | | | | Based on a patch by Russel King <rmk+libav@arm.linux.org.uk> Bug-Id: 646 CC: libav-stable@libav.org
* | Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'Michael Niedermayer2014-03-05
|\| | | | | | | | | | | | | * commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d': x86: cabac: Use correct #includes to make header compile standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: cabac: Use correct #includes to make header compile standaloneDiego Biurrun2014-03-05
| |
* | avcodec/ra144enc: avoid calling emms when the SSE2 version is usedMichael Niedermayer2014-03-05
| | | | | | | | | | | | emms is a rather slow operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra144enc: fix use of scalarprod_int16Christophe Gisquet2014-03-05
| | | | | | | | | | | | | | | | | | | | c3390fd56cf55259ea7665ecea6c8aeddf56e2fc made use of the DSP function but did not complement it with a call to emms, which is done here before computations involving floats are performed. Fixes ticket #3429, which affected MMX/MMXExt machines. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>