xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
d46c1c72e4
FFmpeg/libavfilter
History
Michael Niedermayer d46c1c72e4 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
  avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options_table.h
	libavcodec/snowenc.c
	libavcodec/tiffenc.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_join.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawtext.c
	libavformat/http.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/movenc.c
	libavformat/mpegenc.c
	libavformat/mpegtsenc.c
	libavformat/options_table.h
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 14:33:32 +02:00
..
libmpcodecs libmpcodecs: remove unused and half existing vo_fs variable 2012-09-01 15:37:03 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
af_aconvert.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
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 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_amix.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
af_aresample.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_asetnsamples.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_astreamsync.c af_channelmap: require AV_PERM_PRESERVE. 2012-08-17 18:26:39 +02:00
af_asyncts.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_atempo.c lavfi/af_atempo: use av_malloc for rDFT buffers. 2012-08-29 18:19:41 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_join.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_pan.c amerge/astreamsync/pan: fix license boilerplate. 2012-08-03 00:24:51 +02:00
af_resample.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
af_silencedetect.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_volume.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_volumedetect.c lavfi: add volumedetect filter. 2012-08-19 11:37:05 +02:00
all_channel_layouts.inc lavfi: rename all_channel_layouts.h to all_channel_layouts.inc. 2012-05-18 23:34:11 +02:00
allfilters.c libavfilter: Support the forks ABI for buffer sinks 2012-09-01 06:05:08 +02:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
asrc_abuffer.h asrc_abuffer: deprecate the header. 2012-05-06 16:18:10 +02:00
asrc_aevalsrc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
asrc_anullsrc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
asrc_flite.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
audio.c lavfi: add a closed field to AVFilerLink. 2012-08-22 19:04:30 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
avcodec.c lavfi/avcodec: rename picref->samplesref variable in avfilter_get_audio_buffer_ref_from_frame() 2012-07-30 00:33:13 +02:00
avcodec.h lavfi: add avfilter_get_buffer_ref_from_frame. 2012-07-23 17:14:59 +02:00
avf_concat.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +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 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
avfilter.c lavfi: when configuring a link, set channel layout from previous link if unspecified 2012-09-02 10:42:25 +02:00
avfilter.h lavfi: add a closed field to AVFilerLink. 2012-08-22 19:04:30 +02:00
avfiltergraph.c avfiltergraph: use avcodec_find_best_pix_fmt_of_2() 2012-08-31 21:35:39 +02:00
avfiltergraph.h lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy 2012-07-18 17:13:00 +02:00
bbox.c bbox: remove superfluous initializations 2012-03-22 13:40:37 +01:00
bbox.h lavfi: add bbox filter 2012-03-17 11:21:49 +01:00
buffer.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
bufferqueue.h lavfi: add a generic API for buffer queues. 2012-05-31 17:27:27 +02:00
buffersink.c libavfilter: Support the forks ABI for buffer sinks 2012-09-01 06:05:08 +02:00
buffersink.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
buffersrc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +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 lavfi/drawutils: make ff_draw_color() accept a const rgba map 2012-08-02 12:32:48 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
formats.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
formats.h Fix misspellings of FFmpeg 2012-07-19 18:44:46 +02:00
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
graphdump.c lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h 2012-06-25 13:42:37 +02:00
graphparser.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
lavfutils.c lavfutils: fix incompatible pointer type warning 2012-05-26 20:45:59 +02:00
lavfutils.h lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
libavfilter.v libavfilter: export ff_default_query_formats() 2012-05-25 18:54:01 +02:00
lswsutils.c lswsutils: fix "ncompatible pointer type" warning 2012-05-26 20:46:00 +02:00
lswsutils.h lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
Makefile libavfilter/Makefile: add forgotten entries for the ff-sinks 2012-09-04 18:51:59 +02:00
sink_buffer.c sink_buffer: fix #ifs for FF-sinks 2012-09-04 18:51:59 +02:00
split.c lavfi/split: handle closed outputs. 2012-08-22 19:04:30 +02:00
src_buffer.c lavfi: remove vsrc_buffer.h API 2012-07-03 01:32:16 +02:00
src_movie.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
transform.c libavfilter/transform: fix mirroring. 2012-06-20 23:55:17 +02:00
transform.h lavfi/transform: fix make checkheaders. 2012-05-18 23:34:11 +02:00
version.h lavfi/transpose: implement landscape passthrough mode 2012-09-04 11:39:23 +02:00
vf_alphaextract.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
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 lavfi/video: remove duplicated function ff_null_start_frame_keep_ref() 2012-08-02 12:32:48 +02:00
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_decimate.c lavfi: port decimate libmpcodecs filter 2012-08-31 16:04:37 +02:00
vf_delogo.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +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 commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +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 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +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 vf_framestep: fix uninitilaized variable bug 2012-08-30 05:09:15 +02:00
vf_frei0r.c lavfi/vf_frei0: add missing new line to some error messages 2012-09-01 17:33:50 +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 vf_hqdn3d: remove duplicate inline 2012-08-28 05:31:20 +02:00
vf_hue.c lavfi/hue: add process_command callback 2012-08-31 18:09:30 +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 Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_* 2012-08-31 23:27:21 +02:00
vf_mp.c lavfi/mp: remove decimate wrapper 2012-09-01 09:26:12 +02:00
vf_null.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_overlay.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +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 Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
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_smartblur.c lavfi: add smartblur filter 2012-08-28 19:48:16 +02:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_swapuv.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_thumbnail.c vf_thumbnail: fix permissions. 2012-08-17 18:26:42 +02:00
vf_tile.c vf_tile: fix output buffer ownership. 2012-08-01 12:23:48 +02:00
vf_tinterlace.c vf_tinterlace: leave harmless permissions alone. 2012-08-17 18:26:42 +02:00
vf_transpose.c lavfi/transpose: implement landscape passthrough mode 2012-09-04 11:39:23 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vf_yadif.c yadif: remove unused variable 2012-09-03 22:40:31 +02:00
video.c lavfi: add a closed field to AVFilerLink. 2012-08-22 19:04:30 +02:00
video.h Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vsrc_cellauto.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
vsrc_life.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
vsrc_mandelbrot.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
vsrc_mptestsrc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
vsrc_testsrc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
yadif.h yadif: redesign first and last 2 lines handling. 2012-08-10 00:08:34 +02:00