summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-27
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avfilter: add acrossfade filterPaul B Mahol2015-07-26
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6': lavc: Deprecate avctx.me_method Conflicts: doc/encoders.texi libavcodec/avcodec.h libavcodec/libx264.c libavcodec/motion_est.c libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Deprecate avctx.me_methodVittorio Giovara2015-07-27
| | | | | | | | | | | | | | | | This option is extremely codec specific and only a few codecs employ it. Move it to codec private options instead: mpegenc family supports only 3 values, xavs and x264 use 5, and xvid has a different metric entirely. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '03eb55741427c6608f63972c105e565ca0ba4f15': wmv2enc: Check memory allocation Conflicts: libavcodec/wmv2enc.c See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * wmv2enc: Check memory allocationVittorio Giovara2015-07-27
| |
* | Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | * commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09': ac3enc_template: Use the correct context field See: 320ce9f284171f8c8d8561cccd2186c27f24898c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * ac3enc_template: Use the correct context fieldVittorio Giovara2015-07-27
| | | | | | | | | | For audio encoders, delay has no effect, use the appropriate one, initial_padding (see 2df0c32).
* | avcodec/v410enc: do not use internal->byte_bufferMichael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | it is not optimal when the buffer size is well known at allocation time This avoids a memcpy() about 1% faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: do not use internal->byte_buffer when little downsizing is ↵Michael Niedermayer2015-07-27
| | | | | | | | | | | | expected Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()Michael Niedermayer2015-07-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Add a min size parameter to ff_alloc_packet2()Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | This parameter can be used to inform the allocation code about how much downsizing might occur, and can be used to optimize how to allocate the packet Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | AAC Encoder: clipping avoidanceClaudio Freire2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid clipping due to quantization noise to produce audible artifacts, by detecting near-clipping signals and both attenuating them a little and encoding escape-encoded bands (usually the loudest) rounding towards zero instead of nearest, which tends to decrease overall energy and thus clipping. Currently fate tests measure numerical error so this change makes tests using asynth (which are near clipping) report higher error not less, because of window attenuation. Yet, they sound better, not worse (albeit subtle, other samples aren't subtle at all). Only measuring psychoacoustically weighted error would make for a representative test, so that will be left for a future patch. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegts: Replace silent cliping of language_count by assertsMichael Niedermayer2015-07-27
| | | | | | | | | | | | | | Failure should not be possible, if it does occur then the code is buggy and should be fixed not silently clip Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear functionsShivraj Patil2015-07-27
| | | | | | | | | | | | Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitlesMichael Niedermayer2015-07-27
| | | | | | | | | | | | Fixes Ticket4200 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | * commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c': configure: Check for _M_ARMT to detect thumb when using MSVC Conflicts: configure Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Check for _M_ARMT to detect thumb when using MSVCMartin Storsjö2015-07-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '616b409c8f1e4fa568908212c01f6530da8d2e71'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit '616b409c8f1e4fa568908212c01f6530da8d2e71': configure: Check MSVC defines for identifying hardfloat Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Check MSVC defines for identifying hardfloatMartin Storsjö2015-07-27
| | | | | | | | | | | | | | | | This macro identifies whether VFPv3 is available; MSVC defaults to hardfloat (except for older MSVC versions for CE, targeting ARMv4). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit '2192ff84dd720968108bc1ca54e239f4c94eb61d': configure: Default to armasm for --toolchain=msvc when targeting arm Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Default to armasm for --toolchain=msvc when targeting armMartin Storsjö2015-07-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e4015b00d4e9e40dc1693a018edd51bf7a04993e'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit 'e4015b00d4e9e40dc1693a018edd51bf7a04993e': configure: Simplify, remove an unnecessary intermediate variable Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Simplify, remove an unnecessary intermediate variableMartin Storsjö2015-07-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc': doc: Remove the now unnecessary remark about PATH and link.exe Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * doc: Remove the now unnecessary remark about PATH and link.exeMartin Storsjö2015-07-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe': asfdec: interpret the first flag in an asf packet as length flag Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: interpret the first flag in an asf packet as length flagAlexandra Hájková2015-07-27
| | | | | | | | | | | | if the error correction flag is not set, a packet starts with payload Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '65c14801527068fcaf729eeffc142ffd4682a21a'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit '65c14801527068fcaf729eeffc142ffd4682a21a': checkasm: Modify report format Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * checkasm: Modify report formatHenrik Gramner2015-07-27
| | | | | | | | | | | | | | | | Makes it a bit more clear where each test belongs. Suggested by Anton Khirnov. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | * commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4': qsvdec_*: add missing CODEC_CAP_DR1 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvdec_*: add missing CODEC_CAP_DR1Anton Khirnov2015-07-27
| |
* | ffserver: add (), fix order of operationsMichael Niedermayer2015-07-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffserver: drop superfluous else clauseReynaldo H. Verdejo Pinochet2015-07-26
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: simplify assignment with ternaryReynaldo H. Verdejo Pinochet2015-07-26
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: move decl to start of funcReynaldo H. Verdejo Pinochet2015-07-26
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | doc/decoders: Add entry for dvbsub and document compute_clutMichael Niedermayer2015-07-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dvbsubdec: Add option to select when to computer clut ↵Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | (always/never/"if needed") Reviewed-by: Anshul <anshul.ffmpeg@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'Michael Niedermayer2015-07-26
|\| | | | | | | | | | | | | | | | | | | * commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53': configure: Only redirect strtoll to _strtoi64 if necessary Conflicts: configure Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Only redirect strtoll to _strtoi64 if necessaryMartin Storsjö2015-07-26
| | | | | | | | | | | | This isn't necessary any longer on MSVC 2013 Update 4. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'Michael Niedermayer2015-07-26
|\| | | | | | | | | | | | | | | | | | | * commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a': configure: Only redefine inline to __inline for msvc if necessary Conflicts: configure Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Only redefine inline to __inline for msvc if necessaryMartin Storsjö2015-07-26
| | | | | | | | | | | | This isn't necessary on MSVC 2015 any longer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'Michael Niedermayer2015-07-26
|\| | | | | | | | | | | | | | | | | | | * commit '0cff125200ab53fa3ae70d85b4f614f269fe3426': configure: Only add -FIstdlib.h for msvc/icl if necessary Conflicts: configure Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * configure: Only add -FIstdlib.h for msvc/icl if necessaryMartin Storsjö2015-07-26
| | | | | | | | | | | | | | | | | | This is only necessary on MSVC 2010/2012 (and possibly on some ICL versions). This both avoids an extra hack on newer MSVC versions, and better documents what the extra compiler option is used for. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'Michael Niedermayer2015-07-26
|\| | | | | | | | | | | | | | | | | | | | | * commit '9b4b96c0dee90d260891ec765b28f6ca15594340': force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h Conflicts: libavcodec/dxva2_internal.h See: c5327df838396e7c43a56bdd141c0f01ba3edc94 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.hSteve Lhomme2015-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The struct definitions in dxva.h, which are necessary in order to actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone or WindowsRT. Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed when targeting ARM. ("Compiling Desktop applications for the ARM platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0 to tell the runtime not to detect some issues with this mismatching. The same tweaks to detect if the API is available is done in dxva2_internal.h when compiling each DXVA2/D3D11VA decoders. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/isom: Use AVRN codec to handle AVDJMichael Niedermayer2015-07-26
| | | | | | | | | | | | | | | | Fixes cropping Fixes Ticket4741 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/hlsenc: Fix wording in commentMichael Niedermayer2015-07-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXASteve Lhomme2015-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The struct definitions in dxva.h, which are necessary in order to actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone or WindowsRT. Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed when targeting ARM. ("Compiling Desktop applications for the ARM platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0 to tell the runtime not to detect some issues with this mismatching. The same tweaks to detect if the API is available is done in dxva2_internal.h when compiling each DXVA2/D3D11VA decoders. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 11:31:09 +0000