1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavfilter
Michael Niedermayer 3602ad7ee6 Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
	Makefile
	libavcodec/utils.c
	libavformat/avformat.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-11 04:23:25 +02:00
..
libmpcodecs Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. 2011-06-02 08:38:09 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
af_anull.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
allfilters.c lavfi: add testsrc source 2011-06-26 19:49:24 +02:00
asink_anullsink.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
asrc_anullsrc.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avcodec.c libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
avcodec.h libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
avfilter.c avfilter picture pool: double free hotfix 2011-06-21 04:24:03 +02:00
avfilter.h graphparser: simplify condition in avfilter_graph_parse() 2011-07-10 18:00:50 +02:00
avfiltergraph.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
avfiltergraph.h avfiltergraph: clarify doxy for avfilter_graph_parse() open_inputs/outputs params 2011-07-07 00:37:04 +02:00
defaults.c Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). 2011-06-20 18:56:06 -04:00
drawutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
drawutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
formats.c lavfi: make pix_fmt_is_in() in vf_lut.c an internal function 2011-07-01 12:14:16 +02:00
gradfun.h Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
graphparser.c graphparser: simplify condition in avfilter_graph_parse() 2011-07-10 18:00:50 +02:00
internal.h lavfi: make pix_fmt_is_in() in vf_lut.c an internal function 2011-07-01 12:14:16 +02:00
libavfilter.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
Makefile Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_blackframe.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_copy.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_cropdetect.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_drawbox.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2011-07-08 01:05:28 +02:00
vf_fade.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_fieldorder.c Remove unused variables 2011-06-02 20:06:00 +01:00
vf_fifo.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_format.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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 ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX 2011-06-20 20:54:40 +02:00
vf_lut.c vf_lut: set minimum and maximum alpha value for yuva420p 2011-07-02 15:23:56 +02:00
vf_mp.c vf_mp: do not add duplicated pixel formats. 2011-06-22 19:05:00 +02:00
vf_null.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vf_pad.c vf_pad: fix "vsub" variable value computation 2011-07-04 11:20:00 +02:00
vf_pixdesctest.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_scale.c vf_scale: add a "sar" variable 2011-07-04 11:19:46 +02:00
vf_select.c lavfi: add select filter 2011-05-25 12:54:07 +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 showinfo: replace "CRC" by "checksum" 2011-05-15 12:28:53 +02:00
vf_slicify.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_split.c vf_split: give more meaningful names to the output pads 2011-05-22 02:43:47 +02:00
vf_transpose.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_unsharp.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_vflip.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_yadif.c Add mode to yadif to enable/disable deinterlacing based on src frame "interlaced" flag 2011-07-03 13:19:44 +02:00
vsink_buffer.c vsink_buffer: add missing description 2011-06-25 22:06:30 +02:00
vsink_buffer.h lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
vsink_nullsink.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vsrc_buffer.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vsrc_buffer.h vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_ref 2011-06-06 01:35:27 +02:00
vsrc_color.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vsrc_movie.c Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
vsrc_nullsrc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
vsrc_testsrc.c lavfi: add testsrc source 2011-06-26 19:49:24 +02:00
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00