ffmpeg/libavfilter
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
..
libmpcodecs Replace all strcasecmp/strncasecmp usages. 2011-11-03 19:25:26 +01:00
x86
Makefile lavfi: add life source 2011-12-04 21:18:37 +01:00
af_aconvert.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
af_aconvert_rematrix.c
af_aformat.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_anull.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_aresample.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_ashowinfo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_earwax.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
af_pan.c lavfi: reimplement MPlayer's af_pan filter for libavfilter. 2011-11-18 19:39:26 +01:00
af_volume.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
all_channel_layouts.h
allfilters.c lavfi: add life source 2011-12-04 21:18:37 +01:00
asink_anullsink.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
asrc_abuffer.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
asrc_abuffer.h
asrc_aevalsrc.c aevalsrc: add duration option 2011-12-04 21:13:22 +01:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
avcodec.c
avcodec.h
avfilter.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
avfilter.h lavfi: add life source 2011-12-04 21:18:37 +01:00
avfiltergraph.c
avfiltergraph.h graphparser: Fix doxy on avfilter_graph_parse() return value. 2011-11-22 15:09:26 +01:00
buffersink.h
defaults.c avfilter: align allocated images to 32 for AVX and IFF 2011-11-30 18:53:47 +01:00
drawutils.c lavfi: add internal function ff_fill_rgba_map() 2011-10-28 02:06:50 +02:00
drawutils.h lavfi: add internal function ff_fill_rgba_map() 2011-10-28 02:06:50 +02:00
formats.c avfilter: Error out from avfilter_merge_formats() when there are duplicates 2011-11-23 14:14:01 +01:00
gradfun.h
graphparser.c
internal.h lavfi: add LUT (LookUp Table) generic filters 2011-10-17 18:05:38 +02:00
libavfilter.v
sink_buffer.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
src_movie.c amovie: avoid crash in amovie_request_frame() if no samplesref is available 2011-11-15 00:10:15 +01:00
transform.c doxygen: remove a few @file parameters. 2011-10-04 08:04:17 +02:00
transform.h lavfi: add missing header mulitple-inclusion guard in transform.h 2011-10-20 15:59:20 +02:00
vf_aspect.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_ass.c lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
vf_blackframe.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_boxblur.c vf_boxblur: fix memleak 2011-11-25 04:45:41 +01:00
vf_copy.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_crop.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_cropdetect.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_delogo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_deshake.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_drawbox.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2011-12-08 00:23:37 +01:00
vf_fade.c vf_fade: reindent after previous commit 2011-11-10 01:31:28 +01:00
vf_fieldorder.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_fifo.c Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
vf_format.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_frei0r.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_gradfun.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_hflip.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_hqdn3d.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_libopencv.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_lut.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_mp.c vf_mp: rewrite vf_mp filter warning message 2011-11-23 13:22:46 +01:00
vf_null.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_overlay.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_pad.c pad: fix format string length 2011-11-14 05:42:10 +01:00
vf_pixdesctest.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_scale.c vf_scale: give a clue in case of invalid expression self-reference 2011-12-06 15:03:51 +01:00
vf_select.c cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
vf_setpts.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_settb.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_showinfo.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_slicify.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_split.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_transpose.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_unsharp.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_vflip.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vf_yadif.c yadif, its 2011 2011-11-11 17:06:47 +01:00
vsink_nullsink.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_buffer.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_buffer.h
vsrc_color.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_life.c vsrc_life: fix comment in parse_rule() 2011-12-06 15:03:51 +01:00
vsrc_mandelbrot.c vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized] 2011-11-24 00:08:05 +01:00
vsrc_mptestsrc.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
vsrc_testsrc.c Mark AVFilterPad[] compound literals as const. 2011-11-06 00:05:14 +01:00
yadif.h