ffmpeg/libavfilter
Michael Niedermayer d6f6a7557c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avutil: Do not make ff_ symbols globally visible.
  avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
  build: tms470: work around glibc math.h problems
  configure: improve tms470 compiler usage with glibc

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 15:11:34 +02:00
..
libmpcodecs Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x86 Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
Makefile lavfi: EBU R.128 scanner. 2012-10-01 22:26:19 +02:00
af_aconvert.c
af_aformat.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_amerge.c lavfi/amerge: clarify the error message in case of input overlap 2012-09-11 18:58:19 +02:00
af_amix.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_anull.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_aresample.c af_aresample: fix leak on alloc failure 2012-10-11 16:48:25 +02:00
af_asetnsamples.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_ashowinfo.c lavfi/ashowinfo: check plane value before deferencing. 2012-09-30 21:00:52 +02:00
af_astreamsync.c
af_asyncts.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_atempo.c
af_channelmap.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_channelsplit.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_earwax.c
af_join.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_pan.c af_pan: fix memleak of arg 2012-10-13 01:51:45 +02:00
af_resample.c lavfi: convert input/ouput list compound literals to named objects 2012-10-10 22:26:12 +01:00
af_silencedetect.c lavfi/silencedetect: add av_opt_free() call. 2012-10-09 22:37:29 +02:00
af_volume.c
af_volumedetect.c af_volumedetect: fix use of uninitilaized variable in case of planar audio. 2012-10-11 03:12:40 +02:00
all_channel_layouts.inc
allfilters.c lavfi: EBU R.128 scanner. 2012-10-01 22:26:19 +02:00
asink_anullsink.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
asrc_abuffer.h
asrc_aevalsrc.c asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok() 2012-10-11 03:00:34 +02:00
asrc_anullsrc.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
asrc_flite.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
audio.c lavfi: check that buffer and link properties match. 2012-09-13 20:09:53 +02:00
audio.h
avcodec.c Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' 2012-10-10 14:07:05 +02:00
avcodec.h
avf_concat.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
avf_showspectrum.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avf_showwaves.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfilter.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
avfilter.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfiltergraph.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c avfilter: correct memcpy size avfilter_copy_buf_props() 2012-10-09 21:05:14 +02:00
bufferqueue.h
buffersink.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
buffersink.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
buffersrc.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
buffersrc.h Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
drawutils.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
drawutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
f_ebur128.c lavfi/ebur128: fix typo in condition. 2012-10-11 18:41:07 +02:00
f_sendcmd.c lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
f_setpts.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
f_settb.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
fifo.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
filtfmts.c lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02:00
formats.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
formats.h
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
graphdump.c
graphparser.c
internal.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lavfutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lavfutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter.v
lswsutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lswsutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
sink_buffer.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
split.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
src_buffer.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
src_movie.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
transform.c
transform.h
version.h lavfi/transpose: add passthrough option 2012-10-02 09:43:06 +02:00
vf_alphaextract.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_alphamerge.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_aspect.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_ass.c lavfi/ass: mark ass_libavfilter_log_level_map as static const. 2012-09-16 02:59:43 +02:00
vf_bbox.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_blackdetect.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_blackframe.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_boxblur.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_colormatrix.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_copy.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_crop.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_cropdetect.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_decimate.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_delogo.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_deshake.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_drawbox.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_drawtext.c lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02:00
vf_edgedetect.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_fade.c vf_fade: fix memleaks of args 2012-10-13 01:08:08 +02:00
vf_fieldorder.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_format.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_fps.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_framestep.c
vf_frei0r.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_gradfun.c Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
vf_hflip.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_hqdn3d.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_hue.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_idet.c vf_idet: zero pointers after freeing references 2012-10-11 02:21:28 +02:00
vf_libopencv.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_lut.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_mp.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_null.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_overlay.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_pad.c lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02:00
vf_pixdesctest.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_removelogo.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
vf_select.c lavfi/select/scene: use pointer increments instead of y*linesize. 2012-10-14 02:09:05 +02:00
vf_setfield.c
vf_showinfo.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_slicify.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_smartblur.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_super2xsai.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_swapuv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_thumbnail.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_tile.c
vf_tinterlace.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_transpose.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_unsharp.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_vflip.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_yadif.c Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
video.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
video.h
vsink_nullsink.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vsrc_cellauto.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_life.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_mandelbrot.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_mptestsrc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_testsrc.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00