ffmpeg/libavfilter
Michael Niedermayer f1b5693027 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-07 22:58:39 +02:00
..
libmpcodecs lavfi: remove delogo mp wrapper 2011-08-14 12:26:44 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
Makefile lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
af_aformat.c af_aformat: use evil ADD_FORMATS macro for cutting out duplicated code 2011-08-22 10:34:43 +02:00
af_anull.c
af_aresample.c lavfi: add aresample filter 2011-08-17 13:12:40 +02:00
af_ashowinfo.c lavfi: add ashowinfo filter 2011-08-20 15:00:23 +02:00
allfilters.c lavfi: add amovie source - audio movie source 2011-08-27 12:46:55 +02:00
asink_anullsink.c
asrc_abuffer.c asrc_abuffer: pass non-const string to strtok_r in init() 2011-08-21 11:38:30 +02:00
asrc_abuffer.h lavfi: add asrc_abuffer - audio buffer source 2011-08-21 11:37:57 +02:00
asrc_anullsrc.c
avcodec.c
avcodec.h
avfilter.c avfilter: fix processing multiple commands per frame and filter 2011-08-29 20:39:34 +02:00
avfilter.h lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
avfiltergraph.c avfilter: dont crash on filters with NULL instance names. 2011-09-06 22:23:15 +02:00
avfiltergraph.h avfilter: Add avfilter_graph_que_command() 2011-08-29 20:16:10 +02:00
buffersink.h lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
defaults.c lavfi: avoid void* arithmetic in defaults.c:set_common_formats() 2011-08-06 13:18:09 +02:00
drawutils.c
drawutils.h
formats.c lavfi: add ff_parse_pixel_format() internal function, and use it 2011-08-23 15:45:44 +02:00
gradfun.h
graphparser.c libavfilter/graphparser: Avoid spaces in filter instance names. 2011-08-30 22:02:38 +02:00
internal.h avfilter: Add avfilter_graph_que_command() 2011-08-29 20:16:10 +02:00
libavfilter.v
sink_buffer.c lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 2011-09-06 18:51:09 +02:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_blackframe.c vf_blackframe: port missing features from libmpcodecs blackframe 2011-07-21 13:04:48 +02:00
vf_boxblur.c vf_boxblur: call avfilter_draw_slice() at the end of draw_slice() 2011-08-03 11:18:15 +02:00
vf_copy.c
vf_crop.c vf_crop: add support for a, dar, sar, hsub, and vsub variables 2011-07-30 18:30:07 +02:00
vf_cropdetect.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_delogo.c lavfi: port libmpcodecs delogo filter 2011-08-14 12:17:10 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
vf_fade.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_fieldorder.c
vf_fifo.c
vf_format.c lavfi: add ff_parse_pixel_format() internal function, and use it 2011-08-23 15:45:44 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
vf_gradfun.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_hflip.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_hqdn3d.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_libopencv.c vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 2011-07-18 12:33:13 +02:00
vf_lut.c libavfilter: fix --enable-small 2011-07-21 11:00:47 +02:00
vf_mp.c lavfi: remove delogo mp wrapper 2011-08-14 12:26:44 +02:00
vf_null.c
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_pad.c lavfi: tweak display aspect ratio variables in pad and scale filters 2011-07-30 18:27:24 +02:00
vf_pixdesctest.c
vf_scale.c vf_scale: don't leak SWS context. 2011-08-27 17:23:45 +02:00
vf_select.c vf_select: reindent after the previous commit 2011-08-11 16:09:20 +02:00
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_transpose.c vf_transpose: avoid multiple calls to avfilter_draw_slice() 2011-07-29 20:24:44 +02:00
vf_unsharp.c vf_unsharp: set default chroma size value to 5x5 2011-08-14 16:29:44 +02:00
vf_vflip.c
vf_yadif.c vf_yadif: add support to yuva420p 2011-08-31 16:11:26 +02:00
vsink_nullsink.c
vsrc_buffer.c lavfi: add ff_parse_pixel_format() internal function, and use it 2011-08-23 15:45:44 +02:00
vsrc_buffer.h
vsrc_color.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vsrc_mptestsrc.c lavfi: port mp test source 2011-08-11 16:19:48 +02:00
vsrc_nullsrc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vsrc_testsrc.c vsrc_testsrc: set more properties in the output frames 2011-08-30 10:03:19 +02:00
yadif.h