summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* snowdec: fix off by 1 error in dimensions checkMichael Niedermayer2013-03-121-1/+1
| | | | | | fixes infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/buffersink: move the filter structures at the end.Nicolas George2013-03-111-46/+47
| | | | | Also apply a few cosmetic fixes (spaces, trailing comma) to help match them with the fork's implementation.
* cmdutils: remove conditionnal pp include.Clément Bœsch2013-03-111-2/+0
| | | | | The definition of the include are needed for builds even without pp. This should fix FATE with --disable-gpl after 63edd2f9.
* lavfi/buffersink: implement av_buffersink_get_samples().Nicolas George2013-03-101-2/+70
| | | | | | | | | | | | | | | | Note: the implementation could be more efficient, but at the cost of more diff. Most of the code from the following commit: commit a2cd9be212fca02dd3d6ee65cb6ab9f84c5e28e5 Author: Anton Khirnov <anton@khirnov.net> Date: Fri May 4 19:22:38 2012 +0200 lavfi: add an audio buffer sink. Adapted to call av_buffersink_get_frame_flags() instead of accessing the frame directly.
* lavfi/buffersrc: do not dereference NULL frame.Nicolas George2013-03-101-2/+2
| | | | frame = NULL is used to indicate EOF.
* lavfi: rename sink_buffer.c into buffersink.c.Nicolas George2013-03-102-1/+1
|
* lavfi: remove buffersink.c.Nicolas George2013-03-101-270/+0
| | | | | It only contains merge conflicts leftovers. The real code is in sink_buffer.c.
* lavfi/sink_buffer: move stuff to reduce the diff.Nicolas George2013-03-101-82/+70
| | | | | | Note: av_buffersink_get_samples() is not yet implemented, abuffersink is not yet a drop-in replacement of the fork's abuffersink.
* lavfi/smartblur: add support to named optionsStefano Sabatini2013-03-103-66/+80
|
* ffmpeg: re-enable use of buffersrc flags.Nicolas George2013-03-101-5/+9
| | | | AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
* lavfi/buffersrc: implement flags.Nicolas George2013-03-102-15/+50
| | | | | | | | | | | | The PUSH flags is necessary for efficient scheduling; otherwise there is no feedback when adding frames to closed paths. The NO_CHECK_FORMAT is a small optimization that does not cost much to implement. The KEEP_REF flag maps to the add/write distinction in the fork's API.
* ffmpeg: add the -canvas_size option.Nicolas George2013-03-103-1/+16
| | | | | | | | Allows, amongst other things, to override the size guessed by the sub2video hack. Note: the -s option could have more or less the same semantic, but it receives a special treatment by the options system.
* ffmpeg: port sub2video to AVFrame.Nicolas George2013-03-104-30/+34
| | | | And re-enable the FATE test.
* doc/ffplay,ffmpeg: mention the corresponding negated option for -statsStefano Sabatini2013-03-102-3/+8
| | | | | | | | | This helps lazy users who didn't read the part about boolean options, in case they grep for "-nostats". -stdin and -stats are the only booleans option enabled by default. This is a partial fix for Trac ticket #2332, a complete overhaul of boolean options documentation is probably overkill.
* cmdutils: clarify log message, in case of option routed to both codec and ↵Stefano Sabatini2013-03-101-1/+1
| | | | mux/demux layer
* cmdutils: remove duplicated check on CONFIG_POSTPROCStefano Sabatini2013-03-101-2/+0
| | | | The check is already performed by the PRINT_LIB_INFO macro.
* cmdutils: make print_all_libs_info() show libavresample versionStefano Sabatini2013-03-101-1/+1
| | | | | Even if not directly supported by FFmpeg, it is still useful to see the linked version of libavresample.
* cmdutils: fix stylenitsStefano Sabatini2013-03-101-2/+2
|
* lavfi/unsharp: add missing option flagsStefano Sabatini2013-03-101-13/+14
|
* lavc/utils: fix typo and reword message in case of too low bitrateStefano Sabatini2013-03-101-1/+1
|
* avfilter: avoid direct access to "frame"->channelsMichael Niedermayer2013-03-102-3/+3
| | | | | | This avoids ABI issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* 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>
* lavfi/pad: avoid buffer overflow in buffer_needs_copy()Xi Wang2013-03-101-1/+1
| | | | | | | Replace & with short-circuit &&. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavfi: add curves filter.Clément Bœsch2013-03-106-1/+437
|
* lavfi: bump minor version after the first round of evil changes.Clément Bœsch2013-03-101-2/+2
|
* sink_buffer: remove unused variablesMichael Niedermayer2013-03-101-3/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vp3: embed idct_permutation array directly in VP3DecoderContext.Ronald S. Bultje2013-03-101-4/+5
| | | | | | | This makes the vp3 decoder less dependent on dsputil, and will aid in making it (eventually) dsputil-independent. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: remove remaining forgotten min/rej perms.Clément Bœsch2013-03-1014-21/+3
|
* mpegts: clear avprograms only for removed programsMichael Niedermayer2013-03-101-3/+11
| | | | | | | Fixes Ticket2186 Requested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-03-101-2/+2
|\ | | | | | | | | | | | | * cehoyos/master: Revert "build: disable iconv by default." Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "build: disable iconv by default."Carl Eugen Hoyos2013-03-101-2/+2
| | | | | | | | | | | | | | This reverts commit 9ad3cd5b5f848eb3cd033be515d34296f099148b. The misdetection on OS X should be fixed, we will only get problem reports if auto-detection is enabled.
* | lavfi/hue: reindent.Clément Bœsch2013-03-101-10/+10
| |
* | lavfi/hue: add an optimized direct path.Clément Bœsch2013-03-101-0/+8
| |
* | Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827'Michael Niedermayer2013-03-102-252/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827': mpegvideo_enc: drop support for reusing the input motion vectors. Conflicts: libavcodec/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegvideo_enc: drop support for reusing the input motion vectors.Anton Khirnov2013-03-082-252/+1
| | | | | | | | | | | | | | | | | | 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.
* | | lavu/frame: fix not/note typo in doxy.Clément Bœsch2013-03-101-1/+1
| | |
* | | doc: fix examples.Clément Bœsch2013-03-102-2/+2
| | |
* | | fate: disable sub2videoMichael Niedermayer2013-03-101-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: do not give away our reference to the frame.Nicolas George2013-03-101-1/+2
| | | | | | | | | | | | | | | Note: the logic here is temporary until the updates to ffmpeg.c are merged.
* | | lavc/rawdec: set field order on decoded frame.Nicolas George2013-03-101-6/+6
| | |
* | | rawdec: work with refcounted frames.Nicolas George2013-03-101-36/+63
| | | | | | | | | | | | | | | | | | | | | Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check.
* | | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10124-1926/+1820
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0859-942/+1061
| | | | | | | | | | 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-101-1/+8
| |
* | lavu/frame: copy the channels field.Nicolas George2013-03-101-0/+1
| |
* | lavfi/showspectrum: fix outpicref initialization.Clément Bœsch2013-03-091-1/+3
| | | | | | | | | | | | | | | | 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-094-234/+259
| | | | | | | | | | | | | | 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-094-58/+20
| | | | | | | | | | | | | | | | | | | | 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-091-5/+2
| | | | | | | | | | | | | | 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-091-5/+11
| | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status