generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35,752 Commits 24 Branches 241 Tags 173 MiB
36be045ed7
Commit Graph

1381 Commits

Author SHA1 Message Date
Michael Niedermayer
16b771b1f4 cleanup: for(int 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 21:08:43 +01:00
Clément Bœsch
0b4e5451ba lavfi: use the new audio API in amovie source filter. 2011-12-13 20:25:12 +01:00
Clément Bœsch
220481e1d6 lavfi: skip the frame in case of error. 
This fixes playback with some audio files through filters.
 2011-12-13 20:19:49 +01:00
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Anton Khirnov
cd3716b9aa Replace all uses of av_close_input_file() with avformat_close_input(). 2011-12-12 20:34:38 +01:00
Clément Bœsch
80914cde6f timecode: rename internal ff_* symbols to avpriv_*. 
Those functions are shared between libs.

Also fix a typo in function names: smtpe → smpte.
 2011-12-12 17:49:34 +01:00
Clément Bœsch
fa4e30af7e drawtext: allow burning the timecode. 2011-12-12 17:49:34 +01:00
Andrey Utkin
5b3265a718 lavfi: install libavfilter/vsrc_buffer.h 
It declares API necessary for filtering apps.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-11 19:14:09 +01:00
Clément Bœsch
cc2355817d life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
Clément Bœsch
c88d6b18ce life: add seed information in filter summary. 2011-12-11 13:36:58 +01:00
Stefano Sabatini
6c44ff38d6 lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
Michael Niedermayer
a502939d64 buffersink: Implement a poll function. 
With this the application can find out how many frames are available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 21:19:23 +01:00
Michael Niedermayer
8e2bab5d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  drawtext: remove typo
  pcm-mpeg: implement new audio decoding api
  w32thread: port fixes to pthread_cond_broadcast() from x264.
  doc: add editor configuration section with Vim and Emacs settings
  dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
  avformat/utils: Drop unused goto label.
  doxygen: Replace '\' by '@' in Doxygen markup tags.
  cosmetics: drop some completely pointless parentheses
  cljr: simplify CLJRContext
  drawtext: introduce rand(min, max)
  drawtext: introduce explicit draw/hide variable
  rtmp: Use nb_invokes for all invoke commands

Conflicts:
	libavcodec/mpegvideo.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-08 00:23:37 +01:00
Luca Barbato
78212cefe1 drawtext: remove typo 
It slipped through the last two iterations.
 2011-12-07 20:40:18 +01:00
Luca Barbato
f5edfc9e92 drawtext: introduce rand(min, max) 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Luca Barbato
73585620b8 drawtext: introduce explicit draw/hide variable 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Stefano Sabatini
7ecabc8505 vsrc_life: fix comment in parse_rule() 2011-12-06 15:03:51 +01:00
Stefano Sabatini
3af5ddb24b vf_scale: give a clue in case of invalid expression self-reference 
Address trac ticket #706.
 2011-12-06 15:03:51 +01:00
Reimar Döffinger
c66bd78e3d vf_scale: support PAL8 output by producing BGR8. 
While quality is bad, PAL8 support is needed to allow testing some
encoders that only support PAL8 input.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-12-05 20:05:44 +01:00
Stefano Sabatini
2f8b6e909d lavfi: add life source 2011-12-04 21:18:37 +01:00
Stefano Sabatini
6c26fe8b5a aevalsrc: add duration option 2011-12-04 21:13:22 +01:00
Michael Niedermayer
dda3d716d6 vf_drawtext: support W/H parameters to reduce UI differences to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 15:29:26 +01:00
Michael Niedermayer
f88d5df383 vf_drawtext: cosmetics to reduce diff to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 02:27:45 +01:00
Michael Niedermayer
297422b338 vf_drawtext: Add main_w/h to improve compatibility with the modified UI 
from the fork.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-04 02:08:56 +01:00
Luca Barbato
2cf74eca70 drawtext: make x and y parametric 
Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly.
 2011-12-03 01:35:29 +01:00
Luca Barbato
ec11ff8407 drawtext: manage memory allocation better 
Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed
 2011-12-03 01:35:28 +01:00
Luca Barbato
a2fb4bcb01 drawtext: refactor draw_text 
Split the memory allocation from the actual drawing.
 2011-12-03 01:35:28 +01:00
Michael Niedermayer
8f025f2f60 avfilter: align allocated images to 32 for AVX and IFF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 18:53:47 +01:00
Clément Bœsch
c1ae524e2b avfilter: fix AVFilterPad video only comment. 2011-11-26 19:30:30 +01:00
Stefano Sabatini
28338bc2a3 lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
Michael Niedermayer
022f8d27dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-26 01:12:08 +01:00
Mans Rullgard
cc276c85d1 Make channel layout masks unsigned 
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.

Fixes a few invalid shifts.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 13:19:54 +00:00
Michael Niedermayer
6d16a96a95 vf_boxblur: fix memleak 
As the filter uses the default start frame, the cleanup done by the
default end frame is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 04:45:41 +01:00
Michael Niedermayer
8e576d5830 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
	doc/APIchanges
	libavcodec/tiffenc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cdgraphics
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/nuv
	tests/ref/fate/tiertex-seq
	tests/ref/fate/tscc-32bit
	tests/ref/fate/vmnc-32bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-24 03:32:24 +01:00
Michael Niedermayer
656911d84d vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized] 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-24 00:08:05 +01:00
Michael Niedermayer
248bb81ebc avfilter: Error out from avfilter_merge_formats() when there are duplicates 
instead of trying to continue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-23 14:14:01 +01:00
Michael Niedermayer
4d874fc2b1 vf_mp: rewrite vf_mp filter warning message 
Warning text by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-23 13:22:46 +01:00
Michael Niedermayer
8cda755c2f avfilter: dont write out of array for duplicate formats in avfilter_merge_formats() 
Note, this is a theoretical fix, iam not aware of a case where this function receives
duplicates in its input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-23 13:18:11 +01:00
Michael Niedermayer
78317881f0 graphparser: Fix doxy on avfilter_graph_parse() return value. 
Found-by: ZacS123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-22 15:09:26 +01:00
Clément Bœsch
2f0f9a87d0 Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
Michael Niedermayer
2c44aed82a vsrc_mandelbrot: fix inner=period, the previous optimizations broke it. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-21 04:16:41 +01:00
Michael Niedermayer
90c02ae142 vsrc_mandelbrot: increase maxiter to 7189 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 23:52:29 +01:00
Michael Niedermayer
690860d0d5 vsrc_mandelbrot: Use threshold to detect cycles. 
This way cycles are detected much earlier.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 23:28:56 +01:00
Michael Niedermayer
a5dfedd381 vsrc_mandelbrot: detect edges in interpol() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 22:22:21 +01:00
Michael Niedermayer
4ebbcdb3eb vsrc_mandelbrot: avoid a | in interpol() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 22:11:53 +01:00
Michael Niedermayer
5dd16af6b5 vsrc_mandelbrot: increase default zoom speed by a factor of 2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 19:42:24 +01:00
Michael Niedermayer
ca14808275 vsrc_mandelbrot: spatial interpolation 
speeds the code up by a factor of about 2-3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 19:41:28 +01:00
Michael Niedermayer
56fc4cf04f vsrc_mandelbrot: always store values for periodicity checking, this avoids a few checks. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 15:02:34 +01:00
Michael Niedermayer
da1344e0cd vsrc_mandelbrot: simplify second bailout search by not recalculating values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-19 15:00:26 +01:00