summaryrefslogtreecommitdiff
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'Michael Niedermayer2013-03-131-0/+1
|\ | | | | | | | | | | | | | | | | | | | | * commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d': atomic: prefer gcc builtins over win32 atomics, if available. avframe: copy reordered_opaque in copy_props Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atomic: prefer gcc builtins over win32 atomics, if available.Hendrik Leppkes2013-03-111-3/+3
| | | | | | | | | | | | | | The mingw win32 atomics appear to be faulty, so they should not be used if the gcc ones are available. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avframe: copy reordered_opaque in copy_propsJanne Grunau2013-03-111-0/+1
| | | | | | | | Fixes video playback in applications still using reordered_opaque.
* | Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'Michael Niedermayer2013-03-121-0/+8
|\ \ | |/ | | | | | | | | | | | | | | * commit '6327c10702922eabcb1c6170abd3f03d23ce4c51': atomic: fix CAS with armcc. png: use av_mallocz_array() for the zlib zalloc function libmp3lame: use the correct remaining buffer size when flushing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atomic: fix CAS with armcc.Anton Khirnov2013-03-091-0/+8
| | | | | | | | | | | | On the current code, armcc will fail with: "libavutil/atomic_gcc.h", line 52: Error: #2771: first argument must be a pointer to integer or enumeration type
* | Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'Michael Niedermayer2013-03-121-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '666fe5da47d127074be7f0e2bac93db6af8b4a30': atomic: Exclude the unsupported implementation headers from checkheaders avconv: do not silently ignore unused codec AVOptions. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atomic: Exclude the unsupported implementation headers from checkheadersMartin Storsjö2013-03-081-0/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronizeMartin Storsjö2013-03-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Not all gcc configurations have an implementation of all the atomic operations, and some gcc configurations have some atomic builtins implemented but not all. Thus check for the most essential function, whose presence should indicate that all others are present as well, since it can be used to implement all the other ones. Signed-off-by: Martin Storsjö <martin@martin.st>
| * atomic: Add include guards to the implementation headersMartin Storsjö2013-03-083-0/+14
| | | | | | | | | | | | | | | | This makes them pass standalone compilation tests. Previously, they included atomic.h which included themselves again, leading to double definitions. Signed-off-by: Martin Storsjö <martin@martin.st>
* | dsputil: make selectable.Ronald S. Bultje2013-03-121-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer2013-03-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace remaining includes of audioconvert.h with channel_layout.hAnton Khirnov2013-03-081-1/+1
| |
* | Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'Michael Niedermayer2013-03-121-1/+25
|\ \ | |/ | | | | | | | | | | | | * commit '8df23e938b4022d6e6e9e1180ea6418abae74fda': lavc: postpone the removal of request_channels API. AVFrame: deprecate all now unused fields Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVFrame: deprecate all now unused fieldsAnton Khirnov2013-03-081-1/+25
| |
* | buffer: use the atomic get instead of the add and fetch variant.Clément Bœsch2013-03-121-1/+1
| |
* | get_video_buffer: add vertical paddingMichael Niedermayer2013-03-121-1/+1
| | | | | | | | | | | | Fix memory corruption Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | atomic: prefer gcc builtins over win32 atomics, if available.Hendrik Leppkes2013-03-121-3/+3
| | | | | | | | | | | | | | The mingw win32 atomics appear to be faulty, so they should not be used if the gcc ones are available. Signed-off-by: Martin Storsjö <martin@martin.st>
* | atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronizeMartin Storsjö2013-03-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Not all gcc configurations have an implementation of all the atomic operations, and some gcc configurations have some atomic builtins implemented but not all. Thus check for the most essential function, whose presence should indicate that all others are present as well, since it can be used to implement all the other ones. Signed-off-by: Martin Storsjö <martin@martin.st>
* | mem: Fix usage of memalign() on DJGPP.Fabrizio Gennari2013-03-101-0/+4
| | | | | | | | | | Credits to Khusraw of bttr-software.de forum. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | lavu/frame: fix not/note typo in doxy.Clément Bœsch2013-03-101-1/+1
| |
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | port FFmpeg lavc frame specificities to lavu functions.Clément Bœsch2013-03-101-1/+8
| |
* | lavu/frame: copy the channels field.Nicolas George2013-03-101-0/+1
| |
* | atomic: Add include guards to the implementation headersMartin Storsjö2013-03-083-0/+14
| | | | | | | | | | | | | | | | This makes them pass standalone compilation tests. Previously, they included atomic.h which included themselves again, leading to double definitions. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'Michael Niedermayer2013-03-082-0/+110
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVFrame: add side data.Anton Khirnov2013-03-082-0/+110
| |
* | Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'Michael Niedermayer2013-03-083-0/+945
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e': Move AVFrame from lavc to lavu. Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move AVFrame from lavc to lavu.Anton Khirnov2013-03-083-0/+832
| | | | | | | | Add AVBuffer-based reference counting API to it.
* | Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'Michael Niedermayer2013-03-081-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327': lavc: move AVFrame.hwaccel_picture_private to Picture. Conflicts: libavcodec/avcodec.h libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move AVFrame.hwaccel_picture_private to Picture.Anton Khirnov2013-03-081-1/+3
| | | | | | | | | | This field is private and should not be present in a public struct. It is only used in DXVA with mpegvideo-based decoders currently.
* | Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'Michael Niedermayer2013-03-083-0/+245
|\ \ | |/ | | | | | | | | | | * commit '1cec0624d0e6f48590283a57169b58b9fe8449d3': AVBuffer: add a new API for buffer pools Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVBuffer: add a new API for buffer poolsAnton Khirnov2013-03-083-0/+245
| |
* | Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'Michael Niedermayer2013-03-084-0/+453
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb': lavu: add a new API for reference-counted data buffers. Conflicts: libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add a new API for reference-counted data buffers.Anton Khirnov2013-03-084-0/+453
| |
* | Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'Michael Niedermayer2013-03-086-0/+348
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '65f1d45dcc71186ede72fff950996099d23359bd': lavu: add support for atomic operations. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add support for atomic operations.Ronald S. Bultje2013-03-086-0/+348
| | | | | | | | | | | | | | | | | | | | These could be used for reference counting, or for keeping track of decoding progress in references in multithreaded decoders. Support is provided by gcc/msvc/suncc intrinsics, with a fallback using pthread mutexes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'Michael Niedermayer2013-03-081-1/+1
|\ \ | |/ | | | | | | | | | | | | * commit '4be368b504c6f4a03051448728fc62cd0ed506b2': avstring: Fix isxdigit to not accept non-hex characters configure: Add missing videodsp dependencies to some decoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avstring: Fix isxdigit to not accept non-hex charactersMartin Storsjö2013-03-071-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer2013-03-083-18/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efa7f4202088c70caba11d7834641bc6eaf41830': Use the avstring.h locale-independent character type functions avstring: Add locale independent versions of some ctype.h functions Conflicts: avprobe.c doc/APIchanges libavcodec/dvdsubdec.c libavcodec/utils.c libavutil/avstring.c libavutil/avstring.h libavutil/eval.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-075-8/+6
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avstring: Add locale independent versions of some ctype.h functionsReimar Döffinger2013-03-073-1/+43
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Force using a 64bit intermediate when calculating calendar time with ↵Carl Eugen Hoyos2013-03-081-1/+1
| | | | | | | | | | | | av_timegm(). Fixes a fate failure with icc 13.1
* | lavu: add escape APIStefano Sabatini2013-03-075-2/+124
| | | | | | | | | | | | | | | | The escape API will be useful to perform escaping programmatically, which is required when crafting argument strings, and will be used for context printing as well. This is based on the ffescape tool code, with a few extensions and fixes.
* | lavu/eval: add native support to lte and lt functionsStefano Sabatini2013-03-051-3/+5
| |
* | lavu/opt: fix weird alignStefano Sabatini2013-03-051-1/+1
| |
* | lavu/opt-test: do not explicitly set default value in test_ctxStefano Sabatini2013-03-051-2/+1
| | | | | | | | | | Let av_opt_set_defaults() set the value, which is simpler and more idiomatic.
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-036-11/+42
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-011-3/+3
|\ \ | |/ | | | | | | | | | | * qatar/master: lls: Do not return from void functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: Do not return from void functionsDiego Biurrun2013-03-011-3/+3
| |
* | Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'Michael Niedermayer2013-03-012-4/+8
|\ \ | |/ | | | | | | | | | | * commit '4da950c0ae224b9b8ef952dadf614be2c050023e': lls: #ifndef --> #if in FF_API_ version guard Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status