videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-09 01:07:01 +02:00
Code Releases Activity
052f4f859c
ffmpeg/libavfilter
History
Michael Niedermayer 052f4f859c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 
* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a':
  lavfi: remove 'opaque' parameter from AVFilter.init()
  mov: do not try to read total disc/track number if data atom is too short.
  avconv: fix -force_key_frames
  dxva2_h264: fix signaling of mbaff frames
  x86: fft: elf64: fix PIC build

Conflicts:
	ffmpeg.c
	libavcodec/v210dec.h
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_overlay.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-26 23:57:07 +02:00
..
libmpcodecs Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
af_aconvert.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_aformat.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_amerge.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_amix.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
af_aresample.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_asetnsamples.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_ashowinfo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_astreamsync.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_asyncts.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_atempo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_channelmap.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_channelsplit.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_earwax.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
af_join.c lavfi: remove 'opaque' parameter from AVFilter.init() 2012-06-26 13:13:48 +02:00
af_pan.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_resample.c af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64 2012-06-15 19:10:58 +02:00
af_silencedetect.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_volume.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +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 Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
asrc_abuffer.h asrc_abuffer: deprecate the header. 2012-05-06 16:18:10 +02:00
asrc_aevalsrc.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
asrc_anullsrc.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
audio.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
avcodec.c lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API 2012-06-25 13:42:47 +02:00
avcodec.h lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API 2012-06-25 13:42:47 +02:00
avf_showwaves.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
avfilter.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
avfilter.h Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
avfiltergraph.c lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h 2012-06-25 13:42:37 +02:00
avfiltergraph.h Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +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 lavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c 2012-06-13 10:51:33 +02:00
bufferqueue.h lavfi: add a generic API for buffer queues. 2012-05-31 17:27:27 +02:00
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
buffersink.h buffersink: group libav API functions. 2012-06-26 13:17:29 +02:00
buffersrc.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
buffersrc.h lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h 2012-06-25 13:42:37 +02:00
defaults.c lavfi: drop deprecated and disabled packing API 2012-06-26 11:40:21 +02:00
drawutils.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
drawutils.h drawutils: implement uniform and mask blending. 2012-04-04 16:16:09 +02:00
fifo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
formats.c lavfi: drop deprecated and disabled packing API 2012-06-26 11:40:21 +02:00
formats.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
gradfun.h Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +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-06-13 22:43:57 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +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 Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
sink_buffer.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
split.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
src_buffer.c lavfi: unify src_buffer and buffersrc. 2012-05-19 10:59:52 +02:00
src_movie.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +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: drop deprecated and disabled packing API 2012-06-26 11:40:21 +02:00
vf_aspect.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_ass.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_bbox.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_blackdetect.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_blackframe.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_boxblur.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_colormatrix.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_copy.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_crop.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_cropdetect.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_delogo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_deshake.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_drawbox.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_drawtext.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_fade.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_fieldorder.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_format.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_fps.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_frei0r.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_gradfun.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_hflip.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_hqdn3d.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_idet.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_libopencv.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_lut.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_mp.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_null.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_overlay.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_pad.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_removelogo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_scale.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_select.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_setfield.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_setpts.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_settb.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_showinfo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_slicify.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_super2xsai.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_swapuv.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
vf_tile.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
vf_tinterlace.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
vf_transpose.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_unsharp.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_vflip.c vf_vflip: fix handling of the last line. 2012-06-20 20:14:01 +02:00
vf_yadif.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsrc_buffer.h buffersrc: add av_buffersrc_write_frame(). 2012-05-14 21:36:11 +02:00
vsrc_cellauto.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_color.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vsrc_life.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_mandelbrot.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_mptestsrc.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_testsrc.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00