videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
50,654 Commits 36 Branches 392 Tags 201 MiB
Commit Graph

50654 Commits

Author SHA1 Message Date
Michael Niedermayer 2e7bc9c2a1 snowdec: fix off by 1 error in dimensions check 
fixes infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 02:42:50 +01:00
Nicolas George 73b40e2eb6 lavfi/buffersink: move the filter structures at the end. 
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
 2013-03-11 19:00:49 +01:00
Clément Bœsch 1123080d2e cmdutils: remove conditionnal pp include. 
The definition of the include are needed for builds even without pp.
This should fix FATE with --disable-gpl after 63edd2f9.
 2013-03-11 03:55:23 +01:00
Nicolas George de54a96aa8 lavfi/buffersink: implement av_buffersink_get_samples(). 
Note: the implementation could be more efficient, but at
the cost of more diff.

Most of the code from the following commit:

commit a2cd9be212
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.
 2013-03-10 19:39:25 +01:00
Nicolas George b71db3f38e lavfi/buffersrc: do not dereference NULL frame. 
frame = NULL is used to indicate EOF.
 2013-03-10 17:05:55 +01:00
Nicolas George 03b87fe5e3 lavfi: rename sink_buffer.c into buffersink.c. 2013-03-10 17:05:55 +01:00
Nicolas George 3add5dc88e lavfi: remove buffersink.c. 
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
 2013-03-10 17:05:55 +01:00
Nicolas George fa41f7ecd6 lavfi/sink_buffer: move stuff to reduce the diff. 
Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.
 2013-03-10 17:05:46 +01:00
Stefano Sabatini 35135a3989 lavfi/smartblur: add support to named options 2013-03-10 16:38:45 +01:00
Nicolas George fb14e37dd0 ffmpeg: re-enable use of buffersrc flags. 
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
 2013-03-10 14:07:29 +01:00
Nicolas George b0012de420 lavfi/buffersrc: implement flags. 
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.
 2013-03-10 13:56:17 +01:00
Nicolas George cb2bd91413 ffmpeg: add the -canvas_size option. 
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.
 2013-03-10 13:48:49 +01:00
Nicolas George f9b34b8bf9 ffmpeg: port sub2video to AVFrame. 
And re-enable the FATE test.
 2013-03-10 13:45:15 +01:00
Stefano Sabatini f185a040b0 doc/ffplay,ffmpeg: mention the corresponding negated option for -stats 
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.
 2013-03-10 13:22:59 +01:00
Stefano Sabatini a2a848406f cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer 2013-03-10 13:22:59 +01:00
Stefano Sabatini 63edd2f989 cmdutils: remove duplicated check on CONFIG_POSTPROC 
The check is already performed by the PRINT_LIB_INFO macro.
 2013-03-10 13:22:59 +01:00
Stefano Sabatini 475c090af2 cmdutils: make print_all_libs_info() show libavresample version 
Even if not directly supported by FFmpeg, it is still useful to see the
linked version of libavresample.
 2013-03-10 13:22:59 +01:00
Stefano Sabatini daf6ea5d4e cmdutils: fix stylenits 2013-03-10 13:22:59 +01:00
Stefano Sabatini 606efe18be lavfi/unsharp: add missing option flags 2013-03-10 13:22:58 +01:00
Stefano Sabatini dae76e8c47 lavc/utils: fix typo and reword message in case of too low bitrate 2013-03-10 13:22:58 +01:00
Michael Niedermayer f963c77856 avfilter: avoid direct access to "frame"->channels 
This avoids ABI issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 11:25:54 +01:00
Fabrizio Gennari 91b747ac78 mem: Fix usage of memalign() on DJGPP. 
Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-10 11:12:56 +01:00
Xi Wang 969e8d35b5 lavfi/pad: avoid buffer overflow in buffer_needs_copy() 
Replace & with short-circuit &&.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-03-10 10:38:42 +01:00
Clément Bœsch 65fc80f012 lavfi: add curves filter. 2013-03-10 03:00:10 +01:00
Clément Bœsch 3d813e7ec3 lavfi: bump minor version after the first round of evil changes. 2013-03-10 02:59:43 +01:00
Michael Niedermayer 108434a30c sink_buffer: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:52:15 +01:00
Ronald S. Bultje d5efa84f13 vp3: embed idct_permutation array directly in VP3DecoderContext. 
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>
 2013-03-10 02:51:05 +01:00
Clément Bœsch 96e4b00d62 lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
Michael Niedermayer 806a66fd08 mpegts: clear avprograms only for removed programs 
Fixes Ticket2186

Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:28:05 +01:00
Michael Niedermayer 07ab8d3369 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Revert "build: disable iconv by default."

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:21:04 +01:00
Clément Bœsch f0a5f71074 lavfi/hue: reindent. 2013-03-10 02:13:02 +01:00
Clément Bœsch 3da54858d3 lavfi/hue: add an optimized direct path. 2013-03-10 02:13:02 +01:00
Michael Niedermayer 4a62f477ea Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827' 
* commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827':
  mpegvideo_enc: drop support for reusing the input motion vectors.

Conflicts:
	libavcodec/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 02:10:43 +01:00
Clément Bœsch e53061154f lavu/frame: fix not/note typo in doxy. 2013-03-10 02:07:34 +01:00
Clément Bœsch 5e4bc96415 doc: fix examples. 2013-03-10 01:41:53 +01:00
Michael Niedermayer b1b506bc56 fate: disable sub2video 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 01:41:52 +01:00
Nicolas George 4e7c61b7a7 ffmpeg: do not give away our reference to the frame. 
Note: the logic here is temporary until the updates to
ffmpeg.c are merged.
 2013-03-10 01:41:50 +01:00
Nicolas George 9cc02101ff lavc/rawdec: set field order on decoded frame. 2013-03-10 01:41:49 +01:00
Nicolas George 6184fa2067 rawdec: work with refcounted frames. 
Adapted from commit 759001c534
by Anton Khirnov.

Also, fix the use of || instead of | in a flags check.
 2013-03-10 01:41:48 +01:00
Michael Niedermayer a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* 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
      759001c534 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-10 01:40:35 +01:00
Carl Eugen Hoyos 3f78f0904b Revert "build: disable iconv by default." 
This reverts commit 9ad3cd5b5f.

The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.
 2013-03-10 01:28:16 +01:00
Clément Bœsch 586ae70ba7 port FFmpeg lavc frame specificities to lavu functions. 2013-03-10 01:25:02 +01:00
Nicolas George d1b456b0a8 lavu/frame: copy the channels field. 2013-03-10 01:25:02 +01:00
Clément Bœsch ee0a8bcba1 lavfi/showspectrum: fix outpicref initialization. 
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-09 23:52:33 +01:00
Ronald S. Bultje 22cc8a103c x86/qpel: move fullpel and l2 functions to separate file. 
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-09 17:25:30 +01:00
Ronald S. Bultje 9d40f7106d dsputil: make square put/avg_pixels functions local to h264qpel. 
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-09 17:16:55 +01:00
Giorgio Vazzana 9222978aed lavd/v4l2: simplify code 
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-09 16:59:13 +01:00
Giorgio Vazzana 0286b42540 lavd/v4l2: correctly handle error conditions in mmap_read_frame() 
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-09 16:58:53 +01:00
Carl Eugen Hoyos 982070c113 Add some fate dependencies to fix make fate with --disable-everything. 2013-03-09 15:46:46 +01:00
Carl Eugen Hoyos 881684e27c Add some fate dependencies to fix make fate with --disable-avdevice. 2013-03-09 14:39:13 +01:00