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 7427d1ca4a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  g723.1: simplify scale_vector()
  g723.1: simplify normalize_bits()
  vda: cosmetics: fix Doxygen comment formatting
  vda: better frame allocation
  vda: Merge implementation into one file
  vda: support synchronous decoding
  vda: Reuse the bitstream buffer and reallocate it only if needed
  build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
  avprobe: Include libm.h for the log2 fallback
  proresenc: use the edge emulation buffer
  rtmp: handle bytes read reports
  configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
  Use log2(x) instead of log(x) / log(2)
  x86: swscale: fix fragile memory accesses
  x86: swscale: remove disabled code
  x86: yadif: fix asm with suncc
  x86: cabac: allow building with suncc
  x86: mlpdsp: avoid taking address of void
  ARM: intmath: use native-size return types for clipping functions

Conflicts:
	configure
	ffprobe.c
	libavcodec/Makefile
	libavcodec/g723_1.c
	libavcodec/v210dec.h
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/x86/cabac.h
	libavfilter/x86/yadif_template.c
	libswscale/x86/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-08-14 15:34:39 +02:00
..
libmpcodecs Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
Makefile lavfi: add hue filter 2012-08-13 12:00:54 +02:00
af_aconvert.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
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 Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
af_aresample.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_asetnsamples.c lavfi/asetnsamples: push as many frames as ready 2012-08-14 13:19:52 +02:00
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
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 lavfi: add error handling to filter_samples(). 2012-07-09 08:25:19 +02:00
af_silencedetect.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
af_volume.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
all_channel_layouts.inc
…
allfilters.c lavfi: add hue filter 2012-08-13 12:00:54 +02:00
asink_anullsink.c lavfi: use const for AVFilterPad declarations in all filters. 2012-07-21 16:31:15 -07:00
asrc_abuffer.h
…
asrc_aevalsrc.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
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 lavfi: use min_perms and rej_perms for out pads. 2012-08-14 12:00:35 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
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 lavfi: add avfilter_get_class() and iteration callbacks 2012-08-13 00:04:06 +02:00
avfilter.h lavfi: use min_perms and rej_perms for out pads. 2012-08-14 12:00:35 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
avfiltergraph.h lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy 2012-07-18 17:13:00 +02:00
bbox.c
…
bbox.h
…
buffer.c lavfi: add avfilter_unref_bufferp() 2012-07-20 21:06:18 +02:00
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 lavfi: deprecate av_buffersrc_buffer() function 2012-06-28 22:27:05 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
formats.c Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
formats.h Fix misspellings of FFmpeg 2012-07-19 18:44:46 +02:00
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
graphdump.c lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h 2012-06-25 13:42:37 +02:00
graphparser.c Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
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 lavfi: remove vsrc_buffer.h API 2012-07-03 01:32:16 +02:00
src_movie.c Remove "Error parsing options string [...]" messages. 2012-08-09 08:11:00 +02:00
transform.c libavfilter/transform: fix mirroring. 2012-06-20 23:55:17 +02:00
transform.h
…
version.h lavfi: add hue filter 2012-08-13 12:00:54 +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 Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
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 Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
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_hue.c lavfi: add hue filter 2012-08-13 12:00:54 +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 Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
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 min_perms and rej_perms for out pads. 2012-08-14 12:00:35 +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