Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-10Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer
* 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>
2013-03-10port FFmpeg lavc frame specificities to lavu functions.Clément Bœsch
2013-03-10lavu/frame: copy the channels field.Nicolas George
2013-03-10lavfi/showspectrum: fix outpicref initialization.Clément Bœsch
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.
2013-03-09x86/qpel: move fullpel and l2 functions to separate file.Ronald S. Bultje
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>
2013-03-09dsputil: make square put/avg_pixels functions local to h264qpel.Ronald S. Bultje
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>
2013-03-09lavd/v4l2: simplify codeGiorgio Vazzana
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>
2013-03-09lavd/v4l2: correctly handle error conditions in mmap_read_frame()Giorgio Vazzana
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>
2013-03-09Add some fate dependencies to fix make fate with --disable-everything.Carl Eugen Hoyos
2013-03-09Add some fate dependencies to fix make fate with --disable-avdevice.Carl Eugen Hoyos
2013-03-09libutvideo: Prioritize compatibility with new versionsStephen Hutchinson
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-08atomic: Add include guards to the implementation headersMartin Storsjö
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>
2013-03-08lavc/utils: make sure the iconv descriptor can be opened only once.Clément Bœsch
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.
2013-03-08Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'Michael Niedermayer
* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'Michael Niedermayer
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e': Move AVFrame from lavc to lavu. Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'Michael Niedermayer
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327': lavc: move AVFrame.hwaccel_picture_private to Picture. Conflicts: libavcodec/avcodec.h libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'Michael Niedermayer
* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c': pthread: avoid copying input packets when possible. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer
* 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>
2013-03-08Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'Michael Niedermayer
* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3': AVBuffer: add a new API for buffer pools Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'Michael Niedermayer
* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb': lavu: add a new API for reference-counted data buffers. Conflicts: libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'Michael Niedermayer
* commit '65f1d45dcc71186ede72fff950996099d23359bd': lavu: add support for atomic operations. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit 'eae0879d961b78717dd2a0899809ad22819ae9e3'Michael Niedermayer
* commit 'eae0879d961b78717dd2a0899809ad22819ae9e3': mp3dec: Fix VBR bit rate parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'Michael Niedermayer
* 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>
2013-03-08Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'Michael Niedermayer
* commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8': build: cosmetics: Group hw accelerator Makefile entries together Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'Michael Niedermayer
* 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>
2013-03-08Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'Michael Niedermayer
* commit 'd88738e4038b162708dc2f5342e10c1694edfd89': mpegvideo: Conditionally build error_resilience bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'Michael Niedermayer
* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98': build: Fix error_resilience code dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer
* 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>
2013-03-08MAINTAINERS: update for 1.2n1.3-devMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Revert "aacdec: Reconfigure output as needed, disable ↵Michael Niedermayer
pop_output_configuration()" This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade. This is not needed anymore, Ticket 1694 has been fixed differently
2013-03-08aacsbr: Check for envelope scalefactors overflowingMichael Niedermayer
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>
2013-03-08lavfi: switch to AVFrame.Anton Khirnov
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
2013-03-08AVFrame: add side data.Anton Khirnov
2013-03-08Move AVFrame from lavc to lavu.Anton Khirnov
Add AVBuffer-based reference counting API to it.
2013-03-08lavc: move AVFrame.hwaccel_picture_private to Picture.Anton Khirnov
This field is private and should not be present in a public struct. It is only used in DXVA with mpegvideo-based decoders currently.
2013-03-08pthread: avoid copying input packets when possible.Anton Khirnov
2013-03-08avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov
This will allow us to avoid copying the packets in many cases. This breaks ABI.
2013-03-08AVBuffer: add a new API for buffer poolsAnton Khirnov
2013-03-08lavu: add a new API for reference-counted data buffers.Anton Khirnov
2013-03-08lavu: add support for atomic operations.Ronald S. Bultje
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>
2013-03-08mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov
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>
2013-03-08Close output codecs if input codec initialisation fails.Carl Eugen Hoyos
Fixes ticket #1546 and the remaining part of ticket #1244.
2013-03-08Add dependencies for the voice fate tests.Carl Eugen Hoyos
2013-03-08Add dependencies for the flac encoding fate tests.Carl Eugen Hoyos
2013-03-08Add dependencies for the aac encoding fate tests.Carl Eugen Hoyos
2013-03-08Force using a 64bit intermediate when calculating calendar time with ↵Carl Eugen Hoyos
av_timegm(). Fixes a fate failure with icc 13.1
2013-03-08mpegaudio_parser: Don't ignore information from the first frameAlexander Kojevnikov
Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07aacdec: Reconfigure output as needed, disable pop_output_configuration()Michael Niedermayer
Fixes Ticket1694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07psymodel: dont apply lowpass filters with a cutoff close to the nyquistMichael Niedermayer
The IIR filter numerically diverges in such cases, this could easily be fixed but would make the filter slower on some platforms Fixes Ticket2246 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07avstring: Fix isxdigit to not accept non-hex charactersMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 22:34:28 +0300