RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavfilter
History
Michael Niedermayer 17106a7c90 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  audio_frame_queue: Clean up ff_af_queue_log_state debug function
  dwt: Remove unused code.
  cavs: convert cavsdata.h to a .c file
  cavs: Move inline functions only used in one file out of the header
  cavs: Move data tables used in only one place to that file
  fate: Add a single symbol Ut Video decoder test
  vf_hqdn3d: x86 asm
  vf_hqdn3d: support 16bit colordepth
  avconv: prefer user-forced input framerate when choosing output framerate

Conflicts:
	ffmpeg.c
	libavcodec/audio_frame_queue.c
	libavcodec/dwt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-08-26 22:40:02 +02:00
..
libmpcodecs lavfi/mp: remove framestep wrapped filter 2012-08-18 12:14:46 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
Makefile lavfi: rename vf_setpts.c to f_setpts.c 2012-08-24 12:54:45 +02:00
af_aconvert.c
…
af_aformat.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_amerge.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_amix.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
af_aresample.c
…
af_asetnsamples.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_ashowinfo.c
…
af_astreamsync.c af_channelmap: require AV_PERM_PRESERVE. 2012-08-17 18:26:39 +02:00
af_asyncts.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
af_atempo.c
…
af_channelmap.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_channelsplit.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_earwax.c
…
af_join.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_pan.c
…
af_resample.c
…
af_silencedetect.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
af_volume.c
…
af_volumedetect.c lavfi: add volumedetect filter. 2012-08-19 11:37:05 +02:00
all_channel_layouts.inc
…
allfilters.c lavfi: add showspectrum filter. 2012-08-20 23:03:06 +02:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
asrc_abuffer.h
…
asrc_aevalsrc.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
asrc_anullsrc.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
asrc_flite.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
audio.c lavfi: add a closed field to AVFilerLink. 2012-08-22 19:04:30 +02:00
audio.h
…
avcodec.c
…
avcodec.h
…
avf_concat.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
avf_showspectrum.c lavfi/showspectrum: add priv_class and flags to options 2012-08-21 01:29:25 +02:00
avf_showwaves.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
avfilter.c lavfi: free partial audio buffers when destroying links. 2012-08-22 23:31:49 +02:00
avfilter.h lavfi: add a closed field to AVFilerLink. 2012-08-22 19:04:30 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
avfiltergraph.h
…
bbox.c
…
bbox.h
…
buffer.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
bufferqueue.h
…
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
buffersink.h
…
buffersrc.c lavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH. 2012-08-20 23:40:16 +02:00
buffersrc.h lavfi/buffersrc: add AV_BUFFERSRC_FLAG_PUSH. 2012-08-20 23:40:16 +02:00
drawutils.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
drawutils.h
…
f_setpts.c lavfi/asetpts,setpts: rework debug log 2012-08-24 13:32:59 +02:00
f_settb.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
fifo.c fifo: fix permissions. 2012-08-17 18:26:39 +02:00
filtfmts.c
…
formats.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
formats.h
…
gradfun.h
…
graphdump.c
…
graphparser.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
internal.h
…
lavfutils.c
…
lavfutils.h
…
libavfilter.v
…
lswsutils.c
…
lswsutils.h
…
sink_buffer.c sink_buffer: require AV_PERM_PRESERVE. 2012-08-17 18:26:39 +02:00
split.c lavfi/split: handle closed outputs. 2012-08-22 19:04:30 +02:00
src_buffer.c
…
src_movie.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
transform.c
…
transform.h
…
version.h lavfi/asetpts,setpts: add variables T, STARTT, PREV_INT and PREV_OUTT 2012-08-24 13:32:21 +02:00
vf_alphaextract.c
…
vf_alphamerge.c vf_alphamerge: fix permissions. 2012-08-17 18:26:40 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_ass.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_bbox.c
…
vf_blackdetect.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_colormatrix.c vf_colormatrix: fix permissions. 2012-08-17 18:26:40 +02:00
vf_copy.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_delogo.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_deshake.c vf_deshake: fix permissions. 2012-08-17 18:26:40 +02:00
vf_drawbox.c vf_drawtext: fix permissions. 2012-08-17 18:26:40 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
vf_edgedetect.c lavfi/edgedetect: use "@see" instead of the invalid "@url". 2012-08-20 23:12:34 +02:00
vf_fade.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_fieldorder.c vf_fieldorder: fix permissions. 2012-08-17 18:26:41 +02:00
vf_format.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_fps.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_framestep.c lavfi: add framestep filter 2012-08-18 12:13:34 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
vf_hue.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_idet.c vf_idet: fix permissions. 2012-08-17 18:26:41 +02:00
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
vf_lut.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vf_mp.c lavfi/mp: remove framestep wrapped filter 2012-08-18 12:14:46 +02:00
vf_null.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_overlay.c lavfi/overlay: fix return values. 2012-08-22 19:04:30 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_removelogo.c vf_removelogo: fix permissions. 2012-08-17 18:26:41 +02:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_select.c vf_select: require AV_PERM_PRESERVE. 2012-08-17 18:26:42 +02:00
vf_setfield.c
…
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_super2xsai.c
…
vf_swapuv.c
…
vf_thumbnail.c vf_thumbnail: fix permissions. 2012-08-17 18:26:42 +02:00
vf_tile.c
…
vf_tinterlace.c vf_tinterlace: leave harmless permissions alone. 2012-08-17 18:26:42 +02:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_unsharp.c
…
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_yadif.c vf_yadif: fix permissions. 2012-08-17 18:26:42 +02:00
video.c lavfi: add a closed field to AVFilerLink. 2012-08-22 19:04:30 +02:00
video.h
…
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vsrc_cellauto.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vsrc_life.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vsrc_mandelbrot.c lavfi: add priv class to filter definitions and flags to filter internal options 2012-08-18 10:19:05 +02:00
vsrc_mptestsrc.c
…
vsrc_testsrc.c lavfi/testsrc: set output framerate 2012-08-18 12:02:43 +02:00
yadif.h
…