wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/libavfilter
History
Michael Niedermayer 22d841becd Merge branch 'master' into oldabi 
* master: (780 commits)
  ffmpeg: Fix doxygen comments for MetadataMap
  filters.texi: fix wrong references in the "Filtergraph syntax" section
  yadif: correct documentation on the parity parameter
  mpegvideo.h: remove the 1 line difference to qatar
  applehttp: fix variant discard logic
  Fix possible crash when decoding mpeg streams.
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
  avidec: skip seek pos adjustment for non interleaved files. Fixes Ticket327
  lsws: remove deprecated and unused stuff after the 0->1 major bump
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  Abort if command offset decreases, avoids potential endless loop.
  Warn when falling back to unreliable UMF fps tag.
  Detect NI-avi at playtime like mplayer. Fixes Ticket333
  avidec: Fix XAN DPCM demuxing.
  Fix a possible miscompilation of cabac with old (broken) compilers.
  Fix -loop_input.
  Set bits_per_coded_sample when encoding ADPCM.
  vf_boxblur: call avfilter_draw_slice() at the end of draw_slice()
  vf_boxblur: fix out-of-buffer access when h > w
  ...

Conflicts:
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/opt.h
	libavcodec/version.h
	libavdevice/avdevice.h
	libavfilter/avfilter.h
	libavformat/avformat.h
	libavformat/aviobuf.c
	libavformat/rtsp.c
	libavformat/udp.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-05 13:02:20 +02:00
..
libmpcodecs vf_mp: remove blackframe filter wrapper 2011-07-23 10:55:50 +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 rgbtestsrc source, ported from MPlayer libmpcodecs 2011-07-15 01:44:56 +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 lavfi: add audio channel packing negotiation fields 2011-07-16 19:22:49 +02:00
avfilter.h Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
avfiltergraph.c lavfi: add audio channel packing negotiation fields 2011-07-16 19:22:49 +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 lavfi: add audio channel packing negotiation fields 2011-07-16 19:22:49 +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 audio channel packing negotiation fields 2011-07-16 19:22:49 +02:00
gradfun.h Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
graphparser.c Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +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 vf_mp: remove blackframe filter wrapper 2011-07-23 10:55:50 +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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
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_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 Merge branch 'master' into oldabi 2011-06-21 05:27:44 +02:00
vf_lut.c libavfilter: fix --enable-small 2011-07-21 11:00:47 +02:00
vf_mp.c vf_mp: remove blackframe filter wrapper 2011-07-23 10:55:50 +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 lavfi: tweak display aspect ratio variables in pad and scale filters 2011-07-30 18:27:24 +02:00
vf_pixdesctest.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_scale.c lavfi: tweak display aspect ratio variables in pad and scale filters 2011-07-30 18:27:24 +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 vf_transpose: avoid multiple calls to avfilter_draw_slice() 2011-07-29 20:24:44 +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 yadif: correct documentation on the parity parameter 2011-08-04 19:09:57 +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 '142e76f105' 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 rgbtestsrc source, ported from MPlayer libmpcodecs 2011-07-15 01:44:56 +02:00
yadif.h Change yadif to not use out of picture lines. 2011-04-03 08:46:19 +02:00