aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028'Hendrik Leppkes2015-10-271-2/+2
|\ | | | | | | | | | | | | * commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028': cmdutils: Check for and report the correct codec capability Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * cmdutils: Check for and report the correct codec capabilityVittorio Giovara2015-10-251-2/+2
| |
* | Merge commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8'Hendrik Leppkes2015-10-271-17/+12
|\| | | | | | | | | | | | | * commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8': screenpresso: Drop parameter change check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * screenpresso: Drop parameter change checkVittorio Giovara2015-10-251-17/+12
| | | | | | | | | | Size can never change, allowing us to use ff_reget_buffer, and to simplify the code a little.
* | Merge commit '447b5b278c689b21bbb7b5747c8773145cbd9448'Hendrik Leppkes2015-10-271-9/+13
|\| | | | | | | | | | | | | * commit '447b5b278c689b21bbb7b5747c8773145cbd9448': mpegvideo_enc: Fix encoding videos with less frames than the delay of the encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo_enc: Fix encoding videos with less frames than the delay of the ↵Alexis Ballier2015-10-251-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | encoder When the encoder is fed with less frames than its delay, the picture list looks like { NULL, NULL, ..., frame, frame, frame }. When flushing the encoder (input frame == NULL), we need to ensure the picture list is shifted enough so that we do not return an empty packet, which would mean the encoder has finished, while it has not encoded any frame. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '27eeee76b2546fd313808997b3d07ba9cce94551'Hendrik Leppkes2015-10-270-0/+0
|\| | | | | | | | | | | | | * commit '27eeee76b2546fd313808997b3d07ba9cce94551': mpegvideo_enc: Merge ifs with identical conditions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo_enc: Merge ifs with identical conditionsMichael Niedermayer2015-10-251-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'f0a88d4d2a74534460f4a8b79c448bd5890dbd41'Hendrik Leppkes2015-10-270-0/+0
|\| | | | | | | | | | | | | * commit 'f0a88d4d2a74534460f4a8b79c448bd5890dbd41': mpegvideo_enc: Factor new_picture unref out Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo_enc: Factor new_picture unref outMichael Niedermayer2015-10-251-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '533a6198505edd1379e1cd722852350ae4a85acc'Hendrik Leppkes2015-10-2711-1/+308
|\| | | | | | | | | | | | | * commit '533a6198505edd1379e1cd722852350ae4a85acc': innoHeim/Rsupport Screen Capture Codec decoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * innoHeim/Rsupport Screen Capture Codec decoderVittorio Giovara2015-10-2311-1/+308
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '233d2fa0443197df12b4f7823d591dad964149b3'Hendrik Leppkes2015-10-272-68/+83
|\| | | | | | | | | | | | | * commit '233d2fa0443197df12b4f7823d591dad964149b3': kvazaar: Add libkvazaar HEVC encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * kvazaar: Add libkvazaar HEVC encoderArttu Ylä-Outinen2015-10-238-2/+338
| | | | | | | | | | Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/aiff: add ADP4 DVI ADPCM supportPaul B Mahol2015-10-272-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74'Hendrik Leppkes2015-10-271-3/+10
|\| | | | | | | | | | | | | * commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74': mpjpeg: Cope with multipart lacking the initial CRLF Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpjpeg: Cope with multipart lacking the initial CRLFLuca Barbato2015-10-231-3/+10
| | | | | | | | | | | | | | | | | | Some server in the wild do not put the boundary at a newline as rfc1347 7.2.1 states. Cope with that by reading a line and if it is not empty reading a second one. Reported-By: bitingsock
* | Merge commit '22f4d9c303ede1a240538fd105c97047db40dc86'Hendrik Leppkes2015-10-271-2/+5
|\| | | | | | | | | | | | | * commit '22f4d9c303ede1a240538fd105c97047db40dc86': img2enc: Make sure the images are atomically written Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * img2enc: Make sure the images are atomically writtenLuca Barbato2015-10-231-2/+5
| | | | | | | | | | Users that want to generate a live-preview and serve it would otherwise get partial images.
* | Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa'Hendrik Leppkes2015-10-271-1/+1
|\| | | | | | | | | | | | | * commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa': libx264: Make sure the extradata are padded Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libx264: Make sure the extradata are paddedLuca Barbato2015-10-231-1/+1
| |
* | Merge commit '5ea5a24eb70646a9061b85af407fcbb5dd4f89fd'Hendrik Leppkes2015-10-271-8/+8
|\| | | | | | | | | | | | | * commit '5ea5a24eb70646a9061b85af407fcbb5dd4f89fd': movenc: Honor flush requests with delay_moov, when some tracks lack samples Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Honor flush requests with delay_moov, when some tracks lack samplesMartin Storsjö2015-10-231-8/+8
| | | | | | | | | | | | | | | | This also makes sure that a fragmented file without the empty_moov flag (i.e. with a non-empty initial moov fragment) actually gets written, if some of the tracks turn out to not have any samples. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f'Hendrik Leppkes2015-10-271-3/+1
|\| | | | | | | | | | | | | * commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f': rtsp: Allow $ as interleaved packet indicator before a complete response header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rtsp: Allow $ as interleaved packet indicator before a complete response headerMartin Storsjö2015-10-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some RTSP servers ("HiIpcam/V100R003 VodServer/1.0.0") respond to our keepalive GET_PARAMETER request by a truncated RTSP header (lacking the final empty line to indicate a complete response header). Prior to 764ec70149, this worked just fine since we reacted to the $ as interleaved packet indicator anywhere. Since $ is a valid character within the response header lines, 764ec70149 changed it to be ignored there. But to keep compatibility with such broken servers, we need to at least allow reacting to it at the start of lines. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c'Hendrik Leppkes2015-10-273-68/+25
|\| | | | | | | | | | | | | | | | | | | * commit 'dca23ffbc7568c9af5c5fbaa86e6a0761ecae50c': lavc: Deprecate AVPicture structure and related functions Deprecation flag on AVPicture struct replaced by a comment, as it causes excess deprecation warnings for every include of avcodec.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Deprecate AVPicture structure and related functionsVittorio Giovara2015-10-223-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This structure served as a bridge between data pointers and frames, but it suffers from several limitations: - it is not refcounted and data must be copied to every time - it cannot be expanded without ABI break due to being used on the stack - its functions are just wrappers to imgutils which add a layer of unneeded indirection, and maintenance burden - it allows hacks like embedding uncompressed data in packets - its use is often confusing to our users AVFrame provides a much better API, and, if a full blown frame is not needed, it is just as simple and more straightfoward to use data and linesize arrays directly. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | doc/filters.texi: ebur128 grammar fixKyle Swanson2015-10-271-1/+1
| | | | | | | | | | Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fix: assigning instead of comparingAppChecker2015-10-271-1/+1
| | | | | | | | | | Signed-off-by: AppChecker <support.appc@cnpo.ru> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: disallow hwaccel with frame threadsHendrik Leppkes2015-10-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HWAccels with frame threads are fundamentally flawed in avcodecs current design, and there are several known problems ranging from image corruption to driver crashes. These problems come down to two design problems in the interaction of threads and HWAccel decoding: (1) While avcodec prevents parallel decoding and as such simultaneous access to the hardware accelerator from the decoding threads, it cannot account for the user code and its access to the hardware surfaces and the hardware itself. This can result in image corruption or even driver crashes if the user code locks image surfaces while they are being used by the decoder threads as reference frames. The current HWAccel API does not offer any way to ensure exclusive access to the hardware or the surfaces if frame threading is used. (2) Initialization of the HWAccel with frame threads is non-trivial, and many decoders had and still have issues that cause excess calls to the get_format callback. This will potentially cause duplicate HWAccel initialization, which in extreme cases can even lead to driver crashes if the HWAccel is re-initialized while the user code is actively accessing the hardware surfaces associated with it, or lead to image corruption due to lost reference frames. While both of these issues are solvable, fixing (1) would at least require a huge API redesign which would move a lot of complexity into the user code. The only reason the combination of frame threads and HWAccel was considered useful is to allow a seamless fallback to multi-threaded software decoding if the HWAccel is not available, however the issues outlined above far outweigh this. The proper solution for a fallback is to re-open the AVCodecContext with threading enabled if the HWAccel failed, which is a practice commonly used by various user applications using avcodec today already. Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | FATE: Increase FUZZ value on AAC LTP encoding testRostislav Pehlivanov2015-10-271-1/+1
| | | | | | | | Clang prerelease on Darwin is making the test fail.
* | srtenc: ReindentTimothy Gu2015-10-261-30/+29
| |
* | drawutils: ReindentTimothy Gu2015-10-261-2/+2
| |
* | avfilter: ReindentTimothy Gu2015-10-261-14/+13
| |
* | avcodec: srtdec: ReindentTimothy Gu2015-10-261-8/+7
| |
* | x86/vf_w3fdif: use aligned loads in w3fdif_complex_highJames Almer2015-10-271-4/+2
| | | | | | | | | | Found-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | FATE: Slightly increase thresholds on prediction AAC encoding testsRostislav Pehlivanov2015-10-271-2/+2
| | | | | | | | They barely fail on some systems by being off by 0.81.
* | opusdec: Don't run vector_fmul_scalar on zero length arraysKieran Kunhya2015-10-271-1/+1
| | | | | | | | | | | | | | Fixes crashes on fuzzed files Fixes Ticket4969 part2 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/opusdec: Fix extra samples read indexMichael Niedermayer2015-10-271-2/+2
| | | | | | | | | | | | | | Fixes crash Fixes Ticket4969 part 1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter: add vibrato filterKyle Swanson2015-10-266-1/+230
| | | | | | | | Signed-off-by: Kyle Swanson <k@ylo.ph>
* | avcodec/options: remove a few more redundant "default" informationClément Bœsch2015-10-261-3/+3
| |
* | avcodec/options: remove redundant and wrong default information for skipcmp ↵Clément Bœsch2015-10-261-1/+1
| | | | | | | | option
* | avcodec/avdct: remove redundant "default" information in optionsClément Bœsch2015-10-261-2/+2
| |
* | tests/aac: Add bitexact flags to AAC LTP Encode testDerek Buitenhuis2015-10-261-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | mov: Add support parsing QuickTime Metadata Keys.Tinglin Liu2015-10-262-6/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Apple dev specification: https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/Metadata/Metadata.html Basically the structure is like: |--meta |----hdlr |----keys |----ilst 1) The handler type in the metadata handler atom is ‘mdta’. 2) The key and value are stored separately for each key-value pair. The 'keys' atom stores the key table, while 'ilst' atom stores the values corresponding to the indices in the key table. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | timecode: Support HFR valuesVittorio Giovara2015-10-261-1/+3
| |
* | timecode: Do not fail for non-standard frameratesVittorio Giovara2015-10-261-2/+1
| | | | | | | | | | | | Instead just warn, and use the parse fps normally. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | tests/fate/aac: Add bitexact flags to fate-aac-pns-encodeMichael Niedermayer2015-10-261-1/+1
| | | | | | | | | | | | | | | | | | This fixes a fate failure after bumping the minor version Its unknown why this is not needed for the other aac tests, more investigation needed but for now i dont want to leave it broken while its investigated Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_removegrain: replace qsort with AV_QSORTGanesh Ajjanagadde2015-10-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter_slice calls qsort, so qsort is in a performance critical position. AV_QSORT is substantially faster due to the inlining of the comparison callback. Thus, the increase in performance is worth the increase in binary size. Sample benchmark (x86-64, Haswell, GNU/Linux), filter-removegrain-mode-02 (from FATE) new: 24060 decicycles in qsort, 1 runs, 0 skips 15690 decicycles in qsort, 2 runs, 0 skips 9307 decicycles in qsort, 4 runs, 0 skips 5572 decicycles in qsort, 8 runs, 0 skips 3485 decicycles in qsort, 16 runs, 0 skips 2517 decicycles in qsort, 32 runs, 0 skips 1979 decicycles in qsort, 64 runs, 0 skips 1911 decicycles in qsort, 128 runs, 0 skips 1568 decicycles in qsort, 256 runs, 0 skips 1596 decicycles in qsort, 512 runs, 0 skips 1614 decicycles in qsort, 1024 runs, 0 skips 1874 decicycles in qsort, 2046 runs, 2 skips 2186 decicycles in qsort, 4094 runs, 2 skips old: 246960 decicycles in qsort, 1 runs, 0 skips 135765 decicycles in qsort, 2 runs, 0 skips 70920 decicycles in qsort, 4 runs, 0 skips 37710 decicycles in qsort, 8 runs, 0 skips 20831 decicycles in qsort, 16 runs, 0 skips 12225 decicycles in qsort, 32 runs, 0 skips 8083 decicycles in qsort, 64 runs, 0 skips 6270 decicycles in qsort, 128 runs, 0 skips 5321 decicycles in qsort, 256 runs, 0 skips 4860 decicycles in qsort, 512 runs, 0 skips 4424 decicycles in qsort, 1024 runs, 0 skips 4191 decicycles in qsort, 2046 runs, 2 skips 4934 decicycles in qsort, 4094 runs, 2 skips Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/thp: set duration for audio stream tooPaul B Mahol2015-10-261-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>