1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavfilter
Michael Niedermayer bb9d5171a7 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  swscale: Add Doxygen for hyscale_fast/hScale.
  fate: enable lavfi-pixmt tests on big endian systems
  PPC: swscale: disable altivec functions for unsupported formats
  fate: merge identical pixdesc_be/le tests
  swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
  build: call texi2pod.pl with full path instead of symlink
  build: include sub-makefiles using full path instead of symlinks
  swscale: update big endian reference values after dff5a835.
  wavpack: skip blocks with no samples
  cosmetics: remove outdated comment that is no longer true
  build: replace some addprefix/addsuffix with substitution refs
  avutil: Remove unused arbitrary precision integer code.
  configure: Drop check for availability of ten assembler operands.
  aacenc: Save channel configuration for later use.
  aacenc: Fix codebook trellising for zeroed bands.
  swscale: change prototypes of scaled YUV output functions.
  swscale: re-add support for non-native endianness.
  swscale: disentangle yuv2rgbX_c_full() into small functions.
  swscale: split yuv2packed[12X]_c() remainders into small functions.
  swscale: split yuv2packedX_altivec in smaller functions.
  ...

Conflicts:
	Makefile
	configure
	libavcodec/x86/dsputil_mmx.c
	libavfilter/Makefile
	libavformat/Makefile
	libavutil/integer.c
	libavutil/integer.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-29 05:23:12 +02:00
..
libmpcodecs Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. 2011-06-02 08:38:09 +02:00
x86 Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +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 lavfi: add testsrc source 2011-06-26 19:49:24 +02:00
avfiltergraph.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
avfiltergraph.h avfiltergraph: make the AVFilterInOut alloc/free API public 2011-06-12 22:46:02 +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: minor style fixes in formats.c 2011-06-22 18:28:28 +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: add missing NULL check in avfilter_graph_parse() 2011-06-18 02:08:38 +02:00
internal.h lavfi: apply misc style fixes 2011-06-02 18:24:49 +02:00
libavfilter.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
vf_aspect.c lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio 2011-05-01 13:10:18 +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 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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 drawtext: add braces around initialisers for option defaults 2011-06-20 20:54:40 +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 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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: fix draw_slice() in case of non packed image data for packed RGB 2011-06-27 11:29:34 +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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_pad.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_pixdesctest.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_scale.c Fix type of out[] variable, it should not be const. 2011-06-01 20:26:54 +02:00
vf_select.c lavfi: add select filter 2011-05-25 12:54:07 +02:00
vf_setpts.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_settb.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00: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 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vsrc_movie.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vsrc_nullsrc.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00: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