ffmpeg/libavfilter
Michael Niedermayer a3d331f2d8 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7: (96 commits)
  intfloat_readwrite: fix signed addition overflows
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  sipr: fix get_bits(0) calls
  motion_est: make MotionExtContext.map_generation unsigned
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
  ...

Conflicts:
	libavcodec/adpcm.c
	libavcodec/bink.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/motion_est_template.c
	libavcodec/mpegvideo.c
	libavcodec/nellymoserdec.c
	libavcodec/ptx.c
	libavcodec/svq3.c
	libavcodec/vaapi_vc1.c
	libavcodec/xan.c
	libavfilter/vf_scale.c
	libavformat/4xm.c
	libavformat/flvdec.c
	libavformat/mpeg.c
	tests/ref/fate/motionpixels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-19 05:14:44 +01:00
..
libmpcodecs vf_remove_logo: domt access vf->next->query_format() directly but use the API. 2011-09-21 19:46:42 +02:00
x86 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
Makefile lavfi: fix Makefile HEADERS 2011-06-19 22:58:31 +02:00
af_anull.c
allfilters.c lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
asink_anullsink.c
asrc_anullsrc.c
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 lavfi: add missing check in avfilter_filter_samples() 2012-01-12 21:52:03 +01:00
avfilter.h lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
avfiltergraph.c avfiltergraph: use meaningful error codes 2012-03-18 17:50:17 +01:00
avfiltergraph.h avfiltergraph: make the AVFilterInOut alloc/free API public 2011-06-12 22:46:02 +02:00
defaults.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
drawutils.c
drawutils.h
formats.c lavfi: fix realloc size computation in avfilter_add_format() 2012-02-08 15:04:21 +01: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
vf_aspect.c
vf_blackframe.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_copy.c
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
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 vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 2011-07-18 12:37:22 +02:00
vf_lut.c libavfilter: fix --enable-small 2011-08-15 19:49:17 +02:00
vf_mp.c vf_mp: do not add duplicated pixel formats. 2011-06-22 20:21:54 +02:00
vf_null.c
vf_overlay.c
vf_pad.c Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
vf_pixdesctest.c
vf_scale.c Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
vf_select.c lavfi: add select filter 2011-05-25 12:54:07 +02:00
vf_setpts.c
vf_settb.c
vf_showinfo.c showinfo: replace "CRC" by "checksum" 2011-05-15 12:28:53 +02:00
vf_slicify.c
vf_split.c vf_split: give more meaningful names to the output pads 2011-05-22 02:43:47 +02:00
vf_transpose.c vf_transpose: remove pix_fmts which can currently not be supported. 2011-11-18 21:05:12 +01:00
vf_unsharp.c vf_unsharp: fix out-of-buffer read 2012-02-08 14:38:31 +01:00
vf_vflip.c
vf_yadif.c Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 2012-03-19 05:14:44 +01:00
vsink_buffer.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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
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 lavf: add avformat_find_stream_info() 2011-11-19 10:22:27 +01:00
vsrc_nullsrc.c
yadif.h