RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavfilter
History
Michael Niedermayer 18b0c39f99 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  g723.1: fix addition overflow
  g723.1: simplify and fix multiplication overflow
  g723.1: deobfuscate an expression
  g723.1: remove unused #includes
  ARM: add missing "cc" clobber in av_clipl_int32_arm()
  rtmp: Factorize the code by adding handle_invoke_error
  rtmp: Factorize the code by adding handle_invoke_status
  rtmp: Factorize the code by adding handle_invoke_result
  libavutil: remove unused av_abort() macro
  ffmenc: replace if/abort with assert()
  libavutil: drop offsetof() fallback definition
  libavutil: drop fallback definitions of INTxx_MIN/MAX
  configure: Check for a sctp struct instead of just the header
  configure: suncc: Add -xc99 to dependency flags, required on Solaris
  doxygen: Fix function parameter names to match the code
  doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
  swf: Move shared table out of the header file
  swf: Move swf_audio_codec_tags table to the only place it is used
  fate: add G.723.1 decoder tests

Conflicts:
	configure
	doc/platform.texi
	libavformat/Makefile
	libavutil/arm/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-08-10 16:25:23 +02:00
..
libmpcodecs Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
Makefile lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
af_aconvert.c
…
af_aformat.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_amerge.c amerge/astreamsync/pan: fix license boilerplate. 2012-08-03 00:24:51 +02:00
af_amix.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_anull.c
…
af_aresample.c
…
af_asetnsamples.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_ashowinfo.c
…
af_astreamsync.c amerge/astreamsync/pan: fix license boilerplate. 2012-08-03 00:24:51 +02:00
af_asyncts.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_atempo.c lavfi/atempo: remove dead increment. 2012-08-08 22:53:00 +02:00
af_channelmap.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_channelsplit.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_earwax.c
…
af_join.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_pan.c amerge/astreamsync/pan: fix license boilerplate. 2012-08-03 00:24:51 +02:00
af_resample.c
…
af_silencedetect.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_volume.c
…
all_channel_layouts.inc
…
allfilters.c lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
asink_anullsink.c
…
asrc_abuffer.h
…
asrc_aevalsrc.c
…
asrc_anullsrc.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
asrc_flite.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
audio.c Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
audio.h
…
avcodec.c lavfi/avcodec: rename picref->samplesref variable in avfilter_get_audio_buffer_ref_from_frame() 2012-07-30 00:33:13 +02:00
avcodec.h lavfi: add avfilter_get_buffer_ref_from_frame. 2012-07-23 17:14:59 +02:00
avf_concat.c avf_concat: fix silence duration. 2012-07-28 15:14:01 +02:00
avf_showwaves.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
avfilter.c avfilter: Fix printf format string conversion specifier 2012-07-25 09:24:25 +02:00
avfilter.h lavfi: document the constraints on incoming frames. 2012-08-04 21:49:05 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
avfiltergraph.h
…
bbox.c
…
bbox.h
…
buffer.c
…
bufferqueue.h
…
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
buffersink.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
buffersrc.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
buffersrc.h
…
drawutils.c lavfi/drawutils: make ff_draw_color() accept a const rgba map 2012-08-02 12:32:48 +02:00
drawutils.h lavfi/drawutils: make ff_draw_color() accept a const rgba map 2012-08-02 12:32:48 +02:00
f_settb.c lavfi/asettb: do not create a new reference in filter_samples() 2012-07-31 13:15:51 +02:00
fifo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
filtfmts.c
…
formats.c
…
formats.h
…
gradfun.h
…
graphdump.c
…
graphparser.c
…
internal.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
lavfutils.c
…
lavfutils.h
…
libavfilter.v
…
lswsutils.c
…
lswsutils.h
…
sink_buffer.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
split.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
src_buffer.c
…
src_movie.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
transform.c
…
transform.h
…
version.h lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
vf_alphaextract.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_alphamerge.c vf_alphamerge: Fix reversed conditional 2012-07-27 14:00:04 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_ass.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vf_bbox.c lavfi/video: remove duplicated function ff_null_start_frame_keep_ref() 2012-08-02 12:32:48 +02:00
vf_blackdetect.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vf_blackframe.c lavfi/video: remove duplicated function ff_null_start_frame_keep_ref() 2012-08-02 12:32:48 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_colormatrix.c vf_colormatrix: add missing semicolon 2012-07-23 19:58:13 +00:00
vf_copy.c
…
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_delogo.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vf_deshake.c vf_deshake: set cur_buf to NULL. 2012-07-23 22:44:25 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_drawtext.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_format.c
…
vf_fps.c Replace various inlined inverse AVRational with av_inv_q(). 2012-08-06 00:04:36 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_gradfun.c Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_hqdn3d.c Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
vf_idet.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_libopencv.c cosmetics: Fix a few switched periods and linebreaks 2012-08-04 16:39:27 -04:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_mp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_null.c
…
vf_overlay.c lavfi/overlay: remove dead initialization. 2012-08-06 00:04:36 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_removelogo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_setfield.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_setpts.c lavfi: add asetpts audio filter 2012-08-09 01:03:05 +02:00
vf_showinfo.c lavfi/video: remove duplicated function ff_null_start_frame_keep_ref() 2012-08-02 12:32:48 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_swapuv.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_tile.c vf_tile: fix output buffer ownership. 2012-08-01 12:23:48 +02:00
vf_tinterlace.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_yadif.c yadif: check input video size. 2012-08-10 00:09:34 +02:00
video.c lavfi: use a new field for automatic buffer copy. 2012-08-04 21:49:05 +02:00
video.h Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsrc_cellauto.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vsrc_life.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vsrc_mandelbrot.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vsrc_mptestsrc.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
vsrc_testsrc.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
yadif.h yadif: redesign first and last 2 lines handling. 2012-08-10 00:08:34 +02:00