RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-20 18:11:38 +00:00
Code Issues Projects Releases Wiki Activity
893cf1b1ae
ffmpeg/libavfilter
History
Michael Niedermayer 095946afa7 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7d)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	libavcodec/libvpxenc.c
	libavcodec/rawdec.c
	libavfilter/x86/gradfun.c
	libavformat/Makefile
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-26 00:14:04 +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/release/0.7' into release/0.8 2011-07-26 00:14:04 +02:00
af_anull.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
allfilters.c lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +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 layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02: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: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +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
Makefile lavfi: fix Makefile HEADERS 2011-06-19 22:58:31 +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 vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 2011-07-18 12:37:22 +02:00
vf_lut.c lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
vf_mp.c vf_mp: do not add duplicated pixel formats. 2011-06-22 20:21:54 +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 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 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
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00