summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* doc/resampler, swresample/options: use proper capitalizationGanesh Ajjanagadde2015-10-10
| | | | | | | | | | | | | | Proper names should be capitalized in all user facing API as far as possible. The option names themselves have not been changed since: 1. We consistently keep option names in lower case. 2. Changing them would break existing scripts. 3. I suspect that we want to be similar to Sox and its relevant options. The converse is also true: improper names should not be capitalized generally. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* gitignore: ignore object file temporariesGanesh Ajjanagadde2015-10-10
| | | | | | | | | | | | | | | | During a build, a lot of *.o.-hash files are created - had not noticed this as they are usually dumped in tmpfs on Linux. However, they sometimes are present during a long build in the project directory, making it annoying to commit while the project is being built. These have been observed with Clang, -fsanitize-undefined on Arch Linux, though other configurations may also generate such temporaries. The solution here is on lines with the Linux kernel's .gitignore: https://github.com/torvalds/linux/blob/master/.gitignore. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/scaler, swscale/options: use proper capitalizationGanesh Ajjanagadde2015-10-10
| | | | | | | | | | | | | Proper names should be capitalized in all user facing API as far as possible. The option names themselves have not been changed since: 1. We consistently keep option names in lower case. 2. Changing them would break existing scripts. The converse is also true: improper names should not be capitalized generally. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* fate/async: test error code from underlying protocolZhang Rui2015-10-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/async: pass internal I/O errorZhang Rui2015-10-10
| | | | | | av_fifo_generic_write() does not return any error code. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/x86/vf_w3fdif: add colons after labelsPaul B Mahol2015-10-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc: move bitstream filter args to the bsf ctxRodger Combs2015-10-10
|
* avfilter/vf_w3fdif: add x86 SIMDPaul B Mahol2015-10-10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/developer: minor typo and consistency fixesGanesh Ajjanagadde2015-10-10
| | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* doc/build_system: miscellaneous typo and consistency fixesGanesh Ajjanagadde2015-10-10
| | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avcodec/ac3enc: fix undefined negative left shiftGanesh Ajjanagadde2015-10-10
| | | | | | | | | | | | | | | This should fix the undefined behavior reported in: https://trac.ffmpeg.org/ticket/4727. I can reproduce this at runtime: simply stick in an abort call in asym_quant to check if c < 0 and run FATE. I don't know ac3 so I can't confirm if negative coefficients are intentional, but at the moment they clearly are according to FATE. This resolves the undefined behavior. Tested with FATE. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60'Hendrik Leppkes2015-10-10
|\ | | | | | | | | | | | | * commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60': libopenh264enc: Added max_nal_size option Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264enc: Added max_nal_size optionMario Gasparoni2015-10-09
| | | | | | | | | | | | Also added dynamic slice_mode option, needed for the max_nal_size. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '00cc10aee380f882507bac994ac469d8358d12e8'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit '00cc10aee380f882507bac994ac469d8358d12e8': asfdec: do not skip padding if offset is above packet size - padding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * asfdec: do not skip padding if offset is above packet size - paddingAlexandra Hájková2015-10-08
| | | | | | | | | | | | Sample-Id: https://samples.libav.org/asf-wmv/demux-asf-assert-failed.wmv Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a8956eca1ff3b5b7f9aadbe6eb46536efeb2f828'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit 'a8956eca1ff3b5b7f9aadbe6eb46536efeb2f828': cabac: Make CABAC states hardcoded Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * cabac: Make CABAC states hardcodedAnton Khirnov2015-10-08
| | | | | | | | | | | | | | There is not much reason to generate such a small table at runtime. Signed-off-by: Derek Buitenhuis <derekb@vimeo.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | cabac: Make cabac starts hardcodedAnton Khirnov2015-10-10
| | | | | | | | | | | | There's not much reason to generate such a small table at runtime. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Revert "cabac: Allow hardcoding CABAC table."Derek Buitenhuis2015-10-10
| | | | | | | | | | | | | | | | This becomes unuseful in the following commit. This reverts commit 092d1977cc7146f20c8db2155e7d648afb300de7. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '2830bce47e2eb29c76202f19017031ddc1f95dd3'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit '2830bce47e2eb29c76202f19017031ddc1f95dd3': w32pthreads: Load dynamically loaded functions on demand Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * w32pthreads: Load dynamically loaded functions on demandHendrik Leppkes2015-10-07
| | | | | | | | | | | | | | This removes the requirement of calling w32thread_init before being able to use the threading primitives. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b22693b06d1e5d73454a65c203b4d31c1ca5b69a'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit 'b22693b06d1e5d73454a65c203b4d31c1ca5b69a': w32pthreads: Add pthread_once emulation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * w32pthreads: Add pthread_once emulationHendrik Leppkes2015-10-07
| | | | | | | | | | | | | | | | The emulation uses native InitOnce* APIs on Windows Vista+, and a lock-free/allocation-free approach using atomics and spinning for Windows XP. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit '8b830ee9a26d47b138f12a82085cdb372f407f1e': avconv: Do not try to configure filter outputs without streams Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: Do not try to configure filter outputs without streamsLuca Barbato2015-10-07
| | | | | | | | | | | | Prevent a NULL-dereference. CC: libav-stable@libav.org
* | Merge commit 'd7a5a178c252b625537adc046392624ad543dea7'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit 'd7a5a178c252b625537adc046392624ad543dea7': configure: When disabling a library disable all the related components Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * configure: When disabling a library disable all the related componentsLuca Barbato2015-10-07
| | | | | | | | | | | | This way is sufficient to use the component specific configure variable and not guard against the global library configure variable in code that is outside it (e.g. checkasm).
* | Merge commit '58b42345b38b46d11c32e11d9c57517f99d6a601'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit '58b42345b38b46d11c32e11d9c57517f99d6a601': dcadec: reorganise context data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dcadec: reorganise context dataAlexandra Khirnova2015-10-07
| | | | | | | | | | | | | | | | | | place primary audio coding header data into DCAAudioHeader structure to make DCAContext clearer and move channel related data to DCAChan structure to make them easier to use by extensions Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344'Hendrik Leppkes2015-10-10
|\| | | | | | | | | | | | | * commit '3a4d369ea4ded91b1178ae6e2ff0ab9ea470e344': g2m: Relax resolution change constraints Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * g2m: Relax resolution change constraintsVittorio Giovara2015-10-07
| | | | | | | | | | | | | | Do not fail when original resolution is smaller than current one, as the frame buffer is resized automatically. Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
* | x86/takdsp: use arithmetic shift instructionsJames Almer2015-10-09
| | | | | | | | | | | | | | p1 and p2 are int32_t. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/mov: add support for sidx fragment indexesRodger Combs2015-10-09
| | | | | | | | Fixes trac #3842
* | h264_mp4toannexb: fix the pps offset when there are more than one sps in avcc赵宇龙2015-10-10
| | | | | | | | | | | | | | | | | | | | the pps offset is used to locate pps in the spspps_buf; however, the current calc method is wrong because it is the offset of the original avctx->extradata; when there is only one sps in the avcc; the value is correct by coincidence, however, it will fail in avcc with multi sps Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_mp4toannexb_bsf: Use av_freep() to free spspps_bufMichael Niedermayer2015-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/xvmc: apply attribute_deprecated correctlyGanesh Ajjanagadde2015-10-09
| | | | | | | | | | | | | | | | | | This fixes a warning observed on Clang 3.7: "warning: attribute 'deprecated' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]" and thus enables deprecation warning for the relevant struct. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | avcodec/mpegvideoenc: fix undefined negative left shiftGanesh Ajjanagadde2015-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the first undefined behavior reported in: https://trac.ffmpeg.org/ticket/4727. I can't reproduce the runtime behavior reported in the ticket, hence I can't confirm that this actually fixes the exact issue reported in the ticket. Regardless, I can confirm that this is a genuine issue, and that negative shifts can (and do) occur, fixed by this. Tested with FATE. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add DNxHD/HR testsChristophe Gisquet2015-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only 2 profiles are evaluated because they are the only 2 with distributed test sequences. - CID 1260: YUV 4:2:2 10 bits with block-adaptive interlace coding, from ticket 4876; - CID 1270: YUV 4:4:4 10 bits (HR), 1920x839, from ticket 4581. They were generated from the ticket sequences by running the following kind of command-line; ffmpeg -i $INPUT -an -sn -vcodec copy -vframes 1 -y $OUTPUT.mov Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc: fix spelling errorsAndreas Cadhalpun2015-10-09
| | | | | | | | | | Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/takdec: add x86 SIMD for rest of decorrelation modesPaul B Mahol2015-10-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg: avoid possible undefined behaviorGanesh Ajjanagadde2015-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On lines 1633,1634 FFABS(pts) is performed. However, if av_stream_get_end_pts returns AV_NOPTS_VALUE always, pts remains stuck at INT64_MIN, leading to undefined behavior on FFABS. One could conceive of a solution using FFNABS. However, such a solution has to deal with the implementation defined rounding of integer division with at least one negative operand in ANSI C89. C99 forces truncation to zero, but I am not sure that all of our platforms compile with full C99 support, and in particular whether we can safely assume a fixed rounding behavior across all platforms. This solution is simple, and I doubt changing INT64_MIN to INT64_MIN + 1 has any practical loss - if it is stuck at its initial value, the stream is messed up anyway. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/mjpegenc: Add an option to force outputting chroma matrix.Carl Eugen Hoyos2015-10-09
| | | | | | | | RFC 2435 suggests that mjpeg over rtp uses both two tables.
* | avcodec/pthread_frame: update doxygen for update_context_from_threadGanesh Ajjanagadde2015-10-09
| | | | | | | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | build system: fix dependency generationChristophe Gisquet2015-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to build the binary dct-test under MSYS2/Win64, the makefile rule does not have the SUBDIR in the target for its object file. Consequently, modifications to various include files (e.g. C ones) do not trigger a recompilation. When tracing the dependency generating, the dependency generation has this strange content (linebreak inserted): sed -e "/^#.*/d" -e "s,^[[:space:]]*dct\\.o,libavcodec/dct.o," \ > libavcodec/dct-test.d For some reason, the $(*F) has weird content. It looks simpler to use $(@F) instead of $(*F)\\.o, although this was tested on one single version of make. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_blend: fix normal mode with opacity != 1Paul B Mahol2015-10-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/hls: don't convert NULL options to empty strings; fixes HTTP CRLF warningsRodger Combs2015-10-09
| |
* | lavu/opt: add flag to return NULL when applicable in av_opt_getRodger Combs2015-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavu/opt: switch AV_OPT flags to shift-based formattingRodger Combs2015-10-09
| |
* | build: restore videotoolbox compilation on iOSClément Bœsch2015-10-09
| |
* | avformat/srtdec: make sure we probe a numberClément Bœsch2015-10-09
| | | | | | | | | | Fixes regression since 7218352e0228028dfa009a3799ec93fd041065f1: WebVTT files were matching the SRT probing.