git.sourceforge.jp Git - coroid/ffmpeg_saccubus.git/commit

(root) / coroid / ffmpeg_saccubus.git / commit

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 4 Apr 2011 00:15:12 +0000 (02:15 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 4 Apr 2011 00:15:12 +0000 (02:15 +0200)
commit	2cae9809e2d59c7336fc2cccb97b82c7f764868a
tree	823d962b7237e515e14e2679084e5981d5b808a5	tree \| snapshot
parent	3c9bfb336867ccd32a6e8490930961bcc14b3fdc	commit \| diff
parent	906fd03070c7dc39b4c937befa2c3559bccf7ba7	commit \| diff

Merge remote branch 'qatar/master'

* qatar/master:
  fate: fix partial run when no samples path is specified
  ARM: NEON fixed-point forward MDCT
  ARM: NEON fixed-point FFT
  lavf: bump minor version and add an APIChanges entry for avio changes
  avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
  avio: make url_fdopen internal.
  avio: make url_open_dyn_packet_buf internal.
  avio: avio_ prefix for url_close_dyn_buf
  avio: avio_ prefix for url_open_dyn_buf
  avio: introduce an AVIOContext.seekable field
  ac3enc: use generic fixed-point mdct
  lavfi: add fade filter
  Change yadif to not use out of picture lines.
  lavc: deprecate AVCodecContext.antialias_algo
  lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

66 files changed:

configure	diff1 \|	diff2 \|	blob \| history
doc/APIchanges	diff1 \|	diff2 \|	blob \| history
ffserver.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc_fixed.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc_float.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/fft_fixed_init_arm.c	\|	diff2 \|	blob \| history
libavcodec/avcodec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/fft.c	diff1 \|	diff2 \|	blob \| history
libavcodec/fft.h	diff1 \|	diff2 \|	blob \| history
libavcodec/options.c	diff1 \|	diff2 \|	blob \| history
libavfilter/avfilter.h	diff1 \|	diff2 \|	blob \| history
libavformat/aiffdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/ape.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/au.c	diff1 \|	diff2 \|	blob \| history
libavformat/avc.c	diff1 \|	diff2 \|	blob \| history
libavformat/avidec.c	diff1 \|	diff2 \|	blob \| history
libavformat/avienc.c	diff1 \|	diff2 \|	blob \| history
libavformat/avio.h	diff1 \|	diff2 \|	blob \| history
libavformat/avio_internal.h	diff1 \|	diff2 \|	blob \| history
libavformat/aviobuf.c	diff1 \|	diff2 \|	blob \| history
libavformat/bink.c	diff1 \|	diff2 \|	blob \| history
libavformat/cafdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ffmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/filmstripdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/gxfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/id3v1.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskaenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mmf.c	diff1 \|	diff2 \|	blob \| history
libavformat/mov.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenchint.c	diff1 \|	diff2 \|	blob \| history
libavformat/mp3enc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpeg.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/r3d.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rsoenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_asf.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_latm.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_svq3.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_vp8.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_xiph.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpenc_chain.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtsp.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtspenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/soxenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/swfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/tty.c	diff1 \|	diff2 \|	blob \| history
libavformat/utils.c	diff1 \|	diff2 \|	blob \| history
libavformat/vc1testenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/vocdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/wav.c	diff1 \|	diff2 \|	blob \| history
libavformat/wv.c	diff1 \|	diff2 \|	blob \| history

さきゅばす/いんきゅばす用ffmpeg

RSS Atom

About OSDN

Find Software

Develop Software

Help

configure	diff1 \|	diff2 \|	blob \| history
doc/APIchanges	diff1 \|	diff2 \|	blob \| history
ffserver.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc_fixed.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc_float.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/fft_fixed_init_arm.c	\|	diff2 \|	blob \| history
libavcodec/avcodec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/fft.c	diff1 \|	diff2 \|	blob \| history
libavcodec/fft.h	diff1 \|	diff2 \|	blob \| history
libavcodec/options.c	diff1 \|	diff2 \|	blob \| history
libavfilter/avfilter.h	diff1 \|	diff2 \|	blob \| history
libavformat/aiffdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/ape.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/au.c	diff1 \|	diff2 \|	blob \| history
libavformat/avc.c	diff1 \|	diff2 \|	blob \| history
libavformat/avidec.c	diff1 \|	diff2 \|	blob \| history
libavformat/avienc.c	diff1 \|	diff2 \|	blob \| history
libavformat/avio.h	diff1 \|	diff2 \|	blob \| history
libavformat/avio_internal.h	diff1 \|	diff2 \|	blob \| history
libavformat/aviobuf.c	diff1 \|	diff2 \|	blob \| history
libavformat/bink.c	diff1 \|	diff2 \|	blob \| history
libavformat/cafdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ffmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/filmstripdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/gxfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/id3v1.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskaenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mmf.c	diff1 \|	diff2 \|	blob \| history
libavformat/mov.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenchint.c	diff1 \|	diff2 \|	blob \| history
libavformat/mp3enc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpeg.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/r3d.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rsoenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_asf.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_latm.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_svq3.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_vp8.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpdec_xiph.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpenc_chain.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtsp.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtspenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/soxenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/swfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/tty.c	diff1 \|	diff2 \|	blob \| history
libavformat/utils.c	diff1 \|	diff2 \|	blob \| history
libavformat/vc1testenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/vocdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/wav.c	diff1 \|	diff2 \|	blob \| history
libavformat/wv.c	diff1 \|	diff2 \|	blob \| history