Michael Niedermayer fa3fde168b Merge remote-tracking branch 'qatar/master' ... * qatar/master: libvpxenc: use the default bitrate if not set utvideo: Rename utvideo.c to utvideodec.c doc: Fix syntax errors in sample Emacs config mjpegdec: more meaningful return values configure: clean up Altivec detection getopt: Remove an unnecessary define rtmp: Use int instead of ssize_t getopt: Add missing includes rtmp: Add support for receiving incoming streams Add missing includes for code relying on external libraries Conflicts: libavcodec/libopenjpegenc.c libavcodec/libvpxenc.c libavcodec/mjpegdec.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-17 17:06:52 +02:00
..
libmpcodecs	lavfi/mp: remove hue wrapped filter	2012-08-16 14:13:54 +02:00
x86	yadif: remove libavutil/internal.h include	2012-08-16 17:27:55 +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 remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
af_amerge.c	amerge/astreamsync/pan: fix license boilerplate.	2012-08-03 00:24:51 +02:00
af_amix.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
af_anull.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
af_atempo.c	lavfi/atempo: remove dead increment.	2012-08-08 22:53:00 +02:00
af_channelmap.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
af_channelsplit.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
af_earwax.c	Merge remote-tracking branch 'qatar/master'	2012-07-09 22:40:12 +02:00
af_join.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
af_pan.c	amerge/astreamsync/pan: fix license boilerplate.	2012-08-03 00:24:51 +02:00
af_resample.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03: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 edgedetect filter.	2012-08-16 22:03:32 +02:00
asink_anullsink.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02: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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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-16 16:20:30 +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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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-08-16 16:20:30 +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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
bufferqueue.h
buffersink.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
buffersink.h	Merge remote-tracking branch 'qatar/master'	2012-08-10 16:25:23 +02:00
buffersrc.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
buffersrc.h	lavfi: deprecate av_buffersrc_buffer() function	2012-06-28 22:27:05 +02:00
drawutils.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
fifo.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
filtfmts.c	Merge remote-tracking branch 'qatar/master'	2012-07-04 21:03:28 +02:00
formats.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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 remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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
Makefile	lavfi: add edgedetect filter.	2012-08-16 22:03:32 +02:00
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-08-16 16:20:30 +02:00
src_buffer.c	lavfi: remove vsrc_buffer.h API	2012-07-03 01:32:16 +02:00
src_movie.c	lavfi/movie: extend a doxygen comment.	2012-08-16 20:36:45 +02:00
transform.c	libavfilter/transform: fix mirroring.	2012-06-20 23:55:17 +02:00
transform.h
version.h	lavfi: add edgedetect filter.	2012-08-16 22:03:32 +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-08-16 16:20:30 +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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_boxblur.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_colormatrix.c	vf_colormatrix: add missing semicolon	2012-07-23 19:58:13 +00:00
vf_copy.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_crop.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_cropdetect.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_delogo.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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-08-16 16:20:30 +02:00
vf_drawtext.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_edgedetect.c	lavfi/edgedetect: add rounding for high/low threshold.	2012-08-17 08:08:07 +02:00
vf_fade.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_fieldorder.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_format.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_fps.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_frei0r.c	Merge remote-tracking branch 'qatar/master'	2012-08-17 17:06:52 +02:00
vf_gradfun.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_hflip.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_hqdn3d.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_hue.c	lavfi/hue: add verbose debug message showing initial parameters	2012-08-16 15:02:09 +02:00
vf_idet.c	Merge remote-tracking branch 'qatar/master'	2012-07-22 23:56:21 +02:00
vf_libopencv.c	Merge remote-tracking branch 'qatar/master'	2012-08-17 17:06:52 +02:00
vf_lut.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_mp.c	lavfi/mp: remove hue wrapped filter	2012-08-16 14:13:54 +02:00
vf_null.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_overlay.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_pad.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_pixdesctest.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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-08-16 16:20:30 +02:00
vf_select.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_setfield.c	Merge remote-tracking branch 'qatar/master'	2012-07-22 23:56:21 +02:00
vf_setpts.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_showinfo.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vf_slicify.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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-08-16 16:20:30 +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-08-16 16:20:30 +02:00
vf_yadif.c	yadif: check input video size.	2012-08-10 00:09:34 +02:00
video.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +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-08-16 16:20:30 +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	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
yadif.h	yadif: redesign first and last 2 lines handling.	2012-08-10 00:08:34 +02:00