summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fate/api-tests: Add directory and Makefile for API testsGeorge Boyle2015-06-27
| | | | | | | | The intention of this change is to allow separation of API tests from the existing tests, and also to have a place for the API test source/executable files so they're not mixed in with the actual library code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd'Michael Niedermayer2015-06-26
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd': nvenc: Fix NV12 input Conflicts: libavcodec/nvenc.c Not merged, the changed code is not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nvenc: Fix NV12 inputLuca Barbato2015-06-26
| |
* | Merge commit '072756cdd2f949462520041e357f52f15d8c274d'Michael Niedermayer2015-06-26
|\| | | | | | | | | | | | | | | * commit '072756cdd2f949462520041e357f52f15d8c274d': vc1dec: use get_bits_long and limit the read bits to 32 See: 1f1e0a2971b2a01f275bb5088c2e36166514be64 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: use get_bits_long and limit the read bits to 32Andreas Cadhalpun2015-06-26
| | | | | | | | | | | | | | get_bits should not be used with more than 25 bits. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | s302m: fix arithmetic exceptionAndreas Cadhalpun2015-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If nb_samples is zero, the bit_rate calculation results in a division by zero. Since ff_get_buffer fails if frame->nb_samples is zero, this can be fixed by moving the bit_rate calculation after that function call. That also makes it possible to reuse the already calculated frame->nb_samples value. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec: Add support for per-frame AFD output in h264Kieran Kunhya2015-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Fix tp_index for POCMichael Niedermayer2015-06-26
| | | | | | | | | | | | Fixes Ticket2586 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Print what is found in place of EPH if EPH is not foundMichael Niedermayer2015-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpx: disable unused function prototypesJames Almer2015-06-26
| | | | | | | | | | | | Fixes make checkheader Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/jpeg2000dec: Support progression order changesMichael Niedermayer2015-06-26
| | | | | | | | | | | | Fixes Ticket4657 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Parse POCsMichael Niedermayer2015-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: use get_bits_long and limit the read bits to 32Andreas Cadhalpun2015-06-26
| | | | | | | | | | | | | | get_bits should not be used with more than 25 bits. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | mpegaudiodec: copy AVFloatDSPContext from first context to all contextsAndreas Cadhalpun2015-06-26
| | | | | | | | | | | | | | | | | | This fixes a segfault when decoding multi-channel MP3onMP4 files. This is similar to commit cb72230d for MPADSPContext. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | fate: test ea vp6 with alpha streamPeter Ross2015-06-26
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: do not iterate to next sequence number if interruption is ↵schenk michael2015-06-26
| | | | | | | | | | | | requested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: modify AV_LOG_MAX_OFFSET for AV_LOG_TRACEZhang Rui2015-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: iterate in tile sample space for CPRL & RPCLMichael Niedermayer2015-06-26
| | | | | | | | | | | | | | | | Thats what the spec says should be done aka iterate in the wrong space and use special cases to patch that up. It sometimes can result in different order Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Fix sync_istMichael Niedermayer2015-06-26
| | | | | | | | | | | | This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Add missing \n to av_log()Michael Niedermayer2015-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: iterate over positions with the special cases from jpeg2000Michael Niedermayer2015-06-26
| | | | | | | | | | | | | | | | The order in j2k is not the simple and logic one Fixes Ticket4670 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Add coords to Jpeg2000TileMichael Niedermayer2015-06-26
| | | | | | | | | | | | These will be needed in subsequent commits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vdpau: Support for VDPAU accelerated HEVC decodingPhilip Langdale2015-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces basic support for HEVC decoding through vdpau. Right now, there are problems with the nvidia driver/library implementation that mean that frames are incorrectly laid out in memory when they are returned from the decoder, and it is normally impossible to recover the complete decoded frame due to loss of data from alignment inconsistencies. I obviously hope that nvidia will be fixing it in due course - I've verified the problems exist with their example application. As such, this support is not useful for any real world application, but I believe that it is correct (with the caveat that the mangled frames may hide problems) and will work properly once the nvidia problem is fixed. Right now it appears that any file encoded by x265 or nvenc is decoded correctly, but that's because these files don't use a bunch of HEVC features. Quick summary: Features that seem to work: 1) Short Term References 2) Scaling Lists 3) Tiling Features with known problems: 1) Long Term References It's hard to tell what's going on here. After I read the nvidia example app that does not set the IsLongTerm flag on LTRs, and changed my code, a bunch of frames using LTR started to display correctly, but there are still samples with glitches that are related to LTRs. In terms of real world files, both x265 and nvenc only use short term refs from this list. The divx encoder seems similar. Signed-off-by: Philip Langdale <philipl@overt.org>
* | avcodec/jpeg2000: Remove CBLK limitMichael Niedermayer2015-06-26
| | | | | | | | | | | | | | | | | | This also reduces the amount of memory needed Fixes Ticket4672 The new code seems slightly faster as well, probably due to better cache usage Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use 2 instead of STDERR_FILENOMichael Niedermayer2015-06-25
| | | | | | | | | | | | STDERR_FILENO is not available on windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/evrc: make it possible to disable postfilterPaul B Mahol2015-06-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc+doc: adjust names to reflect ADPCM THP not being GameCube-onlyRodger Combs2015-06-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/brstm: expose the loop point when presentRodger Combs2015-06-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Fix ranlib failure with older cross toolchainsShawn Rainey2015-06-25
| | | | | | | | | | | | | | Cross-compile toolchains without support for ranlib -D would fail. This fixes the configure script to test the cross ranlib rather than the native ranlib. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | modify exit message when signaledrogerdpack2015-06-25
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronicarts: demux alpha streamPeter Ross2015-06-25
| | | | | | | | | | | | | | | | | | Electronic Arts VP6 files may contain two video streams: one for the primary video stream and another for the alpha mask. The file format uses identical data structures for both streams. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronicarts: move video stream properties into dedicated structurePeter Ross2015-06-25
| | | | | | | | | | | | | | This is required for the alpha stream demux patch. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: log error message when shutting down from too many signalsrogerdpack2015-06-25
| | | | | | | | | | write() suggested by wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: fix profile check for intraonly frames.Ronald S. Bultje2015-06-25
| | | | | | | | | | Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat: Add H264 API testLudmila Glinskih2015-06-25
| | | | | | | | | | | | | | Result differs in pkt_duration and time_base.den for some reason. Right now it tests only one example (adjusted to match the output). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Limit x/y step to 1<<30Michael Niedermayer2015-06-25
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket4663 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000: Improve right bottom precinct positionsMichael Niedermayer2015-06-25
| | | | | | | | | | | | Fixes Ticket4656 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Check PPx / PPy valuesMichael Niedermayer2015-06-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: make statement block unconditional by exiting earlyReynaldo H. Verdejo Pinochet2015-06-24
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: make statement block unconditional by exiting earlyReynaldo H. Verdejo Pinochet2015-06-24
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: unify comment formating & drop unneeded bracesReynaldo H. Verdejo Pinochet2015-06-24
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: factor out stream params printingReynaldo H. Verdejo Pinochet2015-06-24
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: simplify URLContext cleanupReynaldo H. Verdejo Pinochet2015-06-24
| | | | | | | | | | | | | | Drop unneeded var and avoid checking for NULL twice as ffurl_closep() already does this. Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | libvpxdec: report colorspaceJames Zern2015-06-24
| | | | | | | | | | Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Zern <jzern@google.com>
* | libvpxdec: report profile for vp9James Zern2015-06-24
| | | | | | | | | | Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Zern <jzern@google.com>
* | Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'Michael Niedermayer2015-06-24
|\| | | | | | | | | | | | | * commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d': TextureDSP: fix erroneous condition which produced blocky output for DXT Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * TextureDSP: fix erroneous condition which produced blocky output for DXTTom Butterworth2015-06-24
| |
* | Merge commit '4d55484391112a30d16812597b9ad81605af0c24'Michael Niedermayer2015-06-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '4d55484391112a30d16812597b9ad81605af0c24': dds: Fix palette mode on big endian Conflicts: libavcodec/dds.c See: 21d2e3d602dc5f173901ba51f6a237b9dfce9e8e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dds: Fix palette mode on big endianLuca Barbato2015-06-24
| | | | | | | | | | Found-By: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'Michael Niedermayer2015-06-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ded5957d75def70d2f1fc1c1eae079230004974b': segafilm: Remove deplanarization hack Conflicts: libavformat/segafilm.c libavformat/version.h See: 42b8f5fba1f067c55231791039283e41b5167247 Merged-by: Michael Niedermayer <michaelni@gmx.at>