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 b286383bd2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  asfdec: read attached pictures.
  apetag: reindent
  apetag: export attached covers as video streams.
  apetag: fix the amount of data read from binary tags.
  apetag: make sure avio_get_str() doesn't read more than it should.
  mov: read itunes cover art.
  snow: remove VLA in mc_block()
  intfloat: Don't use designated initializers in the public headers
  snow: remove a VLA.
  doc: Remind devs to check return values, especially for malloc() et al
  MS ATC Screen (aka MSS3) decoder
  vf_yadif: move x86 init code to x86/yadif.c
  vf_gradfun: move x86 init code to x86/gradfun.c
  roqvideo: Remove a totally unused dspcontext
  smacker: remove some unused code
  dsicin: remove dead assignment
  aacdec: remove dead assignment
  rl2: remove dead assignment
  proresenc: make a variable local to the loop where it is used
  alsdec: remove dead assignments

Conflicts:
	Changelog
	doc/developer.texi
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavfilter/gradfun.h
	libavfilter/x86/gradfun.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-07-02 21:19:41 +02:00
..
libmpcodecs Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
Makefile Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
af_aconvert.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_aformat.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_amerge.c lavfi/amerge: silence warnings 2012-06-28 17:18:37 +00:00
af_amix.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
af_aresample.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_asetnsamples.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_ashowinfo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_astreamsync.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_asyncts.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_atempo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_channelmap.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_channelsplit.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_earwax.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
af_join.c af_join: initialize a variable to shut up gcc warning. 2012-06-26 19:09:15 +02:00
af_pan.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_resample.c lavfi: remove disabled FF_API_SAMPLERATE64 cruft 2012-06-26 13:15:14 +02:00
af_silencedetect.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
af_volume.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
all_channel_layouts.inc
…
allfilters.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
asrc_abuffer.h
…
asrc_aevalsrc.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
audio.c lavfi: implement samples framing on links. 2012-06-30 14:03:54 +02:00
audio.h lavfi: implement samples framing on links. 2012-06-30 14:03:54 +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/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API 2012-06-25 13:42:47 +02:00
avf_showwaves.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
avfilter.c lavfi: implement samples framing on links. 2012-06-30 14:03:54 +02:00
avfilter.h lavfi: implement samples framing on links. 2012-06-30 14:03:54 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
avfiltergraph.h Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
bbox.c
…
bbox.h
…
buffer.c lavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c 2012-06-13 10:51:33 +02:00
bufferqueue.h lavfi: add a generic API for buffer queues. 2012-05-31 17:27:27 +02:00
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
buffersink.h sink_buffer: implement fixed frame size. 2012-06-30 14:03:54 +02:00
buffersrc.c lavfi: deprecate av_buffersrc_buffer() function 2012-06-28 22:27:05 +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
…
fifo.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
formats.c Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
formats.h formats.h: fix project reference in comment 2012-06-29 11:26:18 +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-06-24 02:09:53 +02:00
lavfutils.c lavfutils: fix incompatible pointer type warning 2012-05-26 20:45:59 +02:00
lavfutils.h
…
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
…
sink_buffer.c sink_buffer: implement fixed frame size. 2012-06-30 14:03:54 +02:00
split.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
src_buffer.c
…
src_movie.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
transform.c libavfilter/transform: fix mirroring. 2012-06-20 23:55:17 +02:00
transform.h
…
version.h lavfi: deprecate av_buffersrc_buffer() function 2012-06-28 22:27:05 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +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 commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_blackdetect.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_boxblur.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_colormatrix.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_copy.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_delogo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_deshake.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_drawtext.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_format.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_fps.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
vf_hflip.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_idet.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_lut.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_mp.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_null.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vf_removelogo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_scale.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_select.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_setfield.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_showinfo.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_slicify.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
vf_super2xsai.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_swapuv.c lavfi: update some deprecated functions 2012-06-16 15:15:16 +00:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
vf_tile.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
vf_tinterlace.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vf_vflip.c vf_vflip: fix handling of the last line. 2012-06-20 20:14:01 +02:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
video.c Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
vsrc_buffer.h lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft 2012-06-26 13:15:26 +02:00
vsrc_cellauto.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_color.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
vsrc_life.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_mandelbrot.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_mptestsrc.c lavfi: define macro AVFILTER_DEFINE_CLASS 2012-06-22 23:11:43 +02:00
vsrc_testsrc.c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 2012-06-26 23:57:07 +02:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00