starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 23:21:06 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions
ffmpeg-rockchip/libavfilter
History
Michael Niedermayer 9023de342f Merge commit '1470ce21ce' 
* commit '1470ce21ce':
  Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
  G.723.1 demuxer and decoder
  Add a shift parameter to celp_lp_synthesis_filter()
  libopenjpeg: K&R formatting cosmetics
  yadif: use emms_c() instead of inline assembly for emms invocations.
  ac3: don't use different names for option tables in the template file.
  lavfi: use const for AVFilterPad declarations in all filters.
  adpcm: don't duplicate identical AVSampleFmt array for each encoder.
  configure: cosmetics: Group test dependencies together
  configure: add more passthrough flags in tms470 filter
  configure: move flag filtering functions out of if/else blocks

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/ac3enc_fixed.c
	libavcodec/allcodecs.c
	libavcodec/eac3enc.c
	libavcodec/g723_1.c
	libavcodec/g723_1_data.h
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/v210dec.h
	libavcodec/version.h
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_format.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hflip.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_pixdesctest.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_slicify.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/g723_1.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 22:18:18 +02:00
..
libmpcodecs vf_pp: dont pass NULL into pp, it would fail 2012-07-07 19:14:51 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +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 Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
af_amerge.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_amix.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_anull.c Merge commit '1470ce21ce' 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: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_astreamsync.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_asyncts.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_atempo.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_channelmap.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
af_channelsplit.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_earwax.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_join.c lavfi: add error handling to filter_samples(). 2012-07-09 08:25:19 +02:00
af_pan.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_resample.c lavfi: add error handling to filter_samples(). 2012-07-09 08:25:19 +02:00
af_silencedetect.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +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 lavfi: rename all_channel_layouts.h to all_channel_layouts.inc. 2012-05-18 23:34:11 +02:00
allfilters.c lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +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_abuffer: deprecate the header. 2012-05-06 16:18:10 +02:00
asrc_aevalsrc.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
asrc_anullsrc.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
audio.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
avcodec.c lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API 2012-06-25 13:42:47 +02:00
avcodec.h lavfi: remove vsrc_buffer.h API 2012-07-03 01:32:16 +02:00
avf_showwaves.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
avfilter.c lavfi: rescale link->current_pts. 2012-07-17 23:46:26 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
avfiltergraph.c avfiltergraph: add some debug info about selected pixel formats 2012-07-18 17:22:17 +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: remove superfluous initializations 2012-03-22 13:40:37 +01:00
bbox.h lavfi: add bbox filter 2012-03-17 11:21:49 +01:00
buffer.c lavfi: add avfilter_unref_bufferp() 2012-07-20 21:06:18 +02:00
bufferqueue.h lavfi: add a generic API for buffer queues. 2012-05-31 17:27:27 +02:00
buffersink.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
buffersink.h sink_buffer: implement fixed frame size. 2012-06-30 14:03:54 +02:00
buffersrc.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
buffersrc.h lavfi: deprecate av_buffersrc_buffer() function 2012-06-28 22:27:05 +02:00
defaults.c lavfi: drop deprecated and disabled packing API 2012-06-26 11:40:21 +02:00
drawutils.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
drawutils.h drawutils: implement uniform and mask blending. 2012-04-04 16:16:09 +02:00
f_settb.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
fifo.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
filtfmts.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
formats.c Merge commit '1961e46c15' 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 '1961e46c15' 2012-06-27 00:34:36 +02:00
internal.h lavfi: add FF_*LINK_IDX convenience macros. 2012-07-20 13:16:24 +02:00
lavfutils.c lavfutils: fix incompatible pointer type warning 2012-05-26 20:45:59 +02:00
lavfutils.h lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
libavfilter.v libavfilter: export ff_default_query_formats() 2012-05-25 18:54:01 +02:00
lswsutils.c lswsutils: fix "ncompatible pointer type" warning 2012-05-26 20:46:00 +02:00
lswsutils.h lavfi: port libmpcodecs remove-logo filter 2012-04-07 13:57:39 +02:00
Makefile lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
sink_buffer.c sink_buffer: prevent prematurely freeing of cur_buf 2012-07-21 22:17:36 +02:00
split.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
src_buffer.c lavfi: remove vsrc_buffer.h API 2012-07-03 01:32:16 +02:00
src_movie.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
transform.c libavfilter/transform: fix mirroring. 2012-06-20 23:55:17 +02:00
transform.h lavfi/transform: fix make checkheaders. 2012-05-18 23:34:11 +02:00
version.h lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
vf_alphaextract.c lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
vf_alphamerge.c lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
vf_aspect.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_ass.c vf_ass: fix table name to refer to correct lib. 2012-06-29 11:28:34 +02:00
vf_bbox.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_blackdetect.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_blackframe.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_boxblur.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_colormatrix.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_copy.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_crop.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_cropdetect.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_delogo.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_deshake.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_drawbox.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_drawtext.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_fade.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_fieldorder.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_format.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_fps.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_frei0r.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_gradfun.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_hflip.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_hqdn3d.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_idet.c Merge commit 'a5e8c41c28' 2012-06-26 23:57:07 +02:00
vf_libopencv.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_lut.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_mp.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_null.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_overlay.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_pad.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_pixdesctest.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_removelogo.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_scale.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_select.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_setfield.c Merge commit 'a5e8c41c28' 2012-06-26 23:57:07 +02:00
vf_setpts.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_showinfo.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_slicify.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
vf_swapuv.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_thumbnail.c vf_thumbnail: prevent premature freeing of ref 2012-07-21 22:17:31 +02:00
vf_tile.c lavfi: do not pass opaque field to init functions 2012-07-08 01:18:15 +02:00
vf_tinterlace.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vf_transpose.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_unsharp.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_vflip.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vf_yadif.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-07-21 22:20:49 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsink_nullsink.c lavfi: use const for AVFilterPad declarations in all filters. 2012-07-21 16:31:15 -07:00
vsrc_cellauto.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vsrc_color.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
vsrc_life.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vsrc_mandelbrot.c lavfi: do not pass opaque field to init functions 2012-07-08 01:18:15 +02:00
vsrc_mptestsrc.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vsrc_testsrc.c Merge commit '1470ce21ce' 2012-07-22 22:18:18 +02:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00