- 10 3月, 2013 13 次提交
-
-
由 Michael Niedermayer 提交于
* commit '6e7b50b4': mpegvideo_enc: drop support for reusing the input motion vectors. Conflicts: libavcodec/motion_est.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Clément Bœsch 提交于
-
由 Clément Bœsch 提交于
-
由 Michael Niedermayer 提交于
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Nicolas George 提交于
Note: the logic here is temporary until the updates to ffmpeg.c are merged.
-
由 Nicolas George 提交于
-
由 Nicolas George 提交于
Adapted from commit 759001c5 by Anton Khirnov. Also, fix the use of || instead of | in a flags check.
-
由 Michael Niedermayer 提交于
* commit '7e350379': 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 759001c5 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: NMichael Niedermayer <michaelni@gmx.at> Signed-off-by: NNicolas George <nicolas.george@normalesup.org> Signed-off-by: NClément Bœsch <ubitux@gmail.com> Signed-off-by: NHendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: NMatthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: NStefano Sabatini <stefasab@gmail.com> Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Clément Bœsch 提交于
-
由 Nicolas George 提交于
-
由 Clément Bœsch 提交于
In 81f2549e, 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.
-
由 Ronald S. Bultje 提交于
This way, they can be shared between mpeg4qpel and h264qpel without requiring either one to be compiled unconditionally. Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 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: NMichael Niedermayer <michaelni@gmx.at>
-
- 09 3月, 2013 12 次提交
-
-
由 Giorgio Vazzana 提交于
struct buff_data contains a pointer to struct video_data, so passing the file descriptor again is redundant. Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 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: NMichael Niedermayer <michaelni@gmx.at>
-
由 Carl Eugen Hoyos 提交于
-
由 Carl Eugen Hoyos 提交于
-
由 Stephen Hutchinson 提交于
Signed-off-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>
-
由 Martin Storsjö 提交于
This makes them pass standalone compilation tests. Previously, they included atomic.h which included themselves again, leading to double definitions. Signed-off-by: NMartin Storsjö <martin@martin.st>
-
由 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.
-
由 Michael Niedermayer 提交于
* commit '77b2cd7b': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '7ecc2d40': Move AVFrame from lavc to lavu. Conflicts: libavcodec/avcodec.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit 'ad0c9f2d': lavc: move AVFrame.hwaccel_picture_private to Picture. Conflicts: libavcodec/avcodec.h libavcodec/mpegvideo.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '1a5e9130': pthread: avoid copying input packets when possible. Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '1afddbe5': 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: NMichael Niedermayer <michaelni@gmx.at>
-
- 08 3月, 2013 15 次提交
-
-
由 Michael Niedermayer 提交于
* commit '1cec0624': AVBuffer: add a new API for buffer pools Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '8e401dbe': lavu: add a new API for reference-counted data buffers. Conflicts: libavutil/Makefile Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '65f1d45d': lavu: add support for atomic operations. Conflicts: configure Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit 'eae0879d': mp3dec: Fix VBR bit rate parsing Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '4be368b5': avstring: Fix isxdigit to not accept non-hex characters configure: Add missing videodsp dependencies to some decoders Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit 'dbd2a34b': build: cosmetics: Group hw accelerator Makefile entries together Conflicts: libavcodec/Makefile Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit 'bcd0a713': 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: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit 'd88738e4': mpegvideo: Conditionally build error_resilience bits Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit '06b54e84': build: Fix error_resilience code dependencies Conflicts: configure Merged-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
* commit 'efa7f420': 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: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
-
由 Michael Niedermayer 提交于
This reverts commit 60dbf2ef. This is not needed anymore, Ticket 1694 has been fixed differently
-
由 Michael 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: NMichael Niedermayer <michaelni@gmx.at>
-
由 Anton Khirnov 提交于
This misfeature is most likely completely useless and conflicts with removing the mpegvideo-specific fields from AVFrame. In the improbable case it is actually useful, it should be reimplemented in a better way.
-
由 Anton Khirnov 提交于
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
-