summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-08
| | | | | | | | | | Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
* | port FFmpeg lavc frame specificities to lavu functions.Clément Bœsch2013-03-10
| |
* | lavu/frame: copy the channels field.Nicolas George2013-03-10
| |
* | lavfi/showspectrum: fix outpicref initialization.Clément Bœsch2013-03-09
| | | | | | | | | | | | | | | | In 81f2549, output pixel format was changed from rgb24 to planar yuv, but the initialization was left unchanged. As a result, the chroma planes were left uninitalized. This was not noticed since the current ff_get_video_buffer() seems to be initializing the buffer. This won't be the case anymore after the Evil Plan.
* | x86/qpel: move fullpel and l2 functions to separate file.Ronald S. Bultje2013-03-09
| | | | | | | | | | | | | | This way, they can be shared between mpeg4qpel and h264qpel without requiring either one to be compiled unconditionally. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil: make square put/avg_pixels functions local to h264qpel.Ronald S. Bultje2013-03-09
| | | | | | | | | | | | | | | | | | | | Put a copy of the 8bit functions only in dsputil, where they are used for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps also try to share specifically the 8bit functions from h264qpel between it and the others, but that will be slightly more complicated. H264qpel already had these functions, so we can simply remove the duplicates. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: simplify codeGiorgio Vazzana2013-03-09
| | | | | | | | | | | | | | struct buff_data contains a pointer to struct video_data, so passing the file descriptor again is redundant. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: correctly handle error conditions in mmap_read_frame()Giorgio Vazzana2013-03-09
| | | | | | | | | | | | | | | | | | In particular: 1) save errno before it (possibly) gets overwritten by other calls 2) do not forget to enqueue the buffer again in case of error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add some fate dependencies to fix make fate with --disable-everything.Carl Eugen Hoyos2013-03-09
| |
* | Add some fate dependencies to fix make fate with --disable-avdevice.Carl Eugen Hoyos2013-03-09
| |
* | libutvideo: Prioritize compatibility with new versionsStephen Hutchinson2013-03-08
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | atomic: Add include guards to the implementation headersMartin Storsjö2013-03-08
| | | | | | | | | | | | | | | | 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>
* | lavc/utils: make sure the iconv descriptor can be opened only once.Clément Bœsch2013-03-08
| | | | | | | | | | | | This prevents trying to do some subtitles conversion for each event when the character encoding is not found. It now aborts early instead of flooding stderr.
* | Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVFrame: add side data.Anton Khirnov2013-03-08
| |
* | Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * 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-08
| | | | | | | | Add AVBuffer-based reference counting API to it.
* | Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | * 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-08
| | | | | | | | | | 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 '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | * commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c': pthread: avoid copying input packets when possible. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: avoid copying input packets when possible.Anton Khirnov2013-03-08
| |
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-08
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | * 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-08
| |
* | Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * 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-08
| |
* | Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * 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-08
| | | | | | | | | | | | | | | | | | | | 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 'eae0879d961b78717dd2a0899809ad22819ae9e3'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | * commit 'eae0879d961b78717dd2a0899809ad22819ae9e3': mp3dec: Fix VBR bit rate parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov2013-03-08
| | | | | | | | | | | | | | | | | | | | | | | | When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | * 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-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * configure: Add missing videodsp dependencies to some decodersDiego Biurrun2013-03-07
| |
* | Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8': build: cosmetics: Group hw accelerator Makefile entries together Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: cosmetics: Group hw accelerator Makefile entries togetherDiego Biurrun2013-03-07
| |
* | Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51': configure: Add missing h264chroma dependencies to vp5, vp6 Add missing error_resilience includes to files that use ER Conflicts: configure libavcodec/mpeg12.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Add missing h264chroma dependencies to vp5, vp6Diego Biurrun2013-03-07
| |
| * Add missing error_resilience includes to files that use ERDiego Biurrun2013-03-07
| |
* | Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | * commit 'd88738e4038b162708dc2f5342e10c1694edfd89': mpegvideo: Conditionally build error_resilience bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Conditionally build error_resilience bitsMartin Storsjö2013-03-07
| | | | | | | | | | This breaks the dependency of mpegvideo on error_resilience allowing compilation of components that depend on the former w/o the latter.
* | Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | * commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98': build: Fix error_resilience code dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Fix error_resilience code dependenciesDiego Biurrun2013-03-07
| |
* | Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07
| | | | | | | | | | | | 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-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | MAINTAINERS: update for 1.2Michael Niedermayer2013-03-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "aacdec: Reconfigure output as needed, disable ↵Michael Niedermayer2013-03-08
| | | | | | | | | | | | | | | | pop_output_configuration()" This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade. This is not needed anymore, Ticket 1694 has been fixed differently
* | aacsbr: Check for envelope scalefactors overflowingMichael Niedermayer2013-03-08
| | | | | | | | | | | | | | | | | | | | This prevents various values from becoming stuck at NAN and output to become silent If someone knows a cleaner solution, thats welcome! Fixes Ticket2335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 14:15:10 +0000