Michael Niedermayer 40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' ...

* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-04-20 03:19:47 +02:00

..

x86

…

aeval.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_adelay.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_aecho.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_afade.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_aformat.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_amerge.c

…

af_amix.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_anull.c

…

af_apad.c

…

af_aphaser.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_aresample.c

…

af_asetnsamples.c

…

af_asetrate.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_ashowinfo.c

…

af_astats.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_astreamsync.c

…

af_asyncts.c

…

af_atempo.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_biquads.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_bs2b.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_channelmap.c

af_channelmap: fix number of channels

2015-03-28 11:16:26 +01:00

af_channelsplit.c

…

af_chorus.c

avfilter: add chorus filter

2015-04-11 20:39:43 +00:00

af_compand.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_dcshift.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_earwax.c

…

af_flanger.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_join.c

…

af_ladspa.c

…

af_pan.c

…

af_replaygain.c

…

af_resample.c

…

af_silencedetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_silenceremove.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_volume.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

af_volume.h

avfilter/af_volume: Change enums to int, which are accessed via AVOption as int

2015-03-02 04:08:22 +01:00

af_volumedetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

all_channel_layouts.inc

…

allfilters.c

avfilter: add chorus filter

2015-04-11 20:39:43 +00:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_anullsrc.c

…

asrc_flite.c

…

asrc_sine.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

audio.c

…

audio.h

…

avcodec.c

…

avcodec.h

…

avf_avectorscope.c

avfilter/avf_avectorscope: Change enums to int, which are accessed via AVOption as int

2015-03-02 04:08:18 +01:00

avf_concat.c

…

avf_showcqt.c

lavfi/avf_showcqt: fix error code.

2015-04-16 12:38:28 +02:00

avf_showspectrum.c

avfilter/avf_showspectrum: Change enums to int, which are accessed via AVOption as int

2015-03-02 04:08:14 +01:00

avf_showwaves.c

lavfi: add showwavespic filter

2015-03-18 12:19:08 +01:00

avfilter.c

Replace av_dlog with normal av_log at trace level

2015-04-19 12:41:59 +01:00

avfilter.h

Merge commit 'cfe64613923a2d47644a87386146ada1f9f6b659'

2015-03-22 04:03:20 +01:00

avfiltergraph.c

…

avfiltergraph.h

…

avfilterres.rc

…

bbox.c

…

bbox.h

…

buffer.c

…

bufferqueue.h

…

buffersink.c

…

buffersink.h

…

buffersrc.c

…

buffersrc.h

…

deshake_opencl_kernel.h

…

deshake_opencl.c

…

deshake_opencl.h

…

deshake.h

…

drawutils.c

…

drawutils.h

…

dualinput.c

…

dualinput.h

…

f_ebur128.c

…

f_interleave.c

…

f_perms.c

avfilter/f_perms: Change enums to int, which are accessed via AVOption as int

2015-03-07 02:45:49 +01:00

f_select.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

f_sendcmd.c

lavfi/sendcmd: improve error reporting and robustness in case of missing commands

2015-03-16 10:49:25 +01:00

f_zmq.c

…

fifo.c

…

filtfmts.c

filtfmts: Avoid null pointer dereference

2015-04-03 17:23:45 +02:00

formats.c

avfilter/formats: proper error handling in ff_set_common_*() functions

2015-03-16 23:43:12 +01:00

formats.h

avfilter/formats: proper error handling in ff_set_common_*() functions

2015-03-16 23:43:12 +01:00

framesync.c

…

framesync.h

…

generate_wave_table.c

…

generate_wave_table.h

…

gradfun.h

…

graphdump.c

…

graphparser.c

…

interlace.h

…

internal.h

Replace av_dlog with normal av_log at trace level

2015-04-19 12:41:59 +01:00

lavfutils.c

avfilter/lavfutils: use av_frame_free for freeing an AVFrame

2015-03-02 21:27:21 +01:00

lavfutils.h

…

libavfilter.v

…

log2_tab.c

…

lswsutils.c

…

lswsutils.h

…

Makefile

avfilter: add chorus filter

2015-04-11 20:39:43 +00:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

…

setpts.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

settb.c

…

split.c

…

src_movie.c

…

thread.h

…

tinterlace.h

avfilter/tinterlace: Change enum to int, which is accessed via AVOption as int

2015-03-30 00:08:57 +02:00

transform.c

…

transform.h

…

trim.c

…

unsharp_opencl_kernel.h

…

unsharp_opencl.c

…

unsharp_opencl.h

…

unsharp.h

…

version.h

avfilter: add chorus filter

2015-04-11 20:39:43 +00:00

vf_alphamerge.c

…

vf_aspect.c

…

vf_bbox.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_blackdetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_blackframe.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_blend.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_boxblur.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_codecview.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_colorbalance.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_colorchannelmixer.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_colorlevels.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_colormatrix.c

avfilter/vf_colormatrix: fix yuv420p threading, second try

2015-03-19 00:03:29 +01:00

vf_copy.c

…

vf_crop.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

vf_cropdetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_curves.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_dctdnoiz.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_decimate.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_dejudder.c

…

vf_delogo.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_deshake.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_detelecine.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_drawbox.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_drawtext.c

Replace av_dlog with normal av_log at trace level

2015-04-19 12:41:59 +01:00

vf_edgedetect.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_elbg.c

Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats

2015-03-18 01:18:40 +01:00

vf_eq.c

lavfi/eq: rework expression evaluation

2015-03-20 09:41:32 +01:00

vf_eq.h

lavfi/eq: rework expression evaluation

2015-03-20 09:41:32 +01:00

vf_extractplanes.c

…

vf_fade.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fftfilt.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_field.c

avfilter/vf_field: Change enum to int, which is accessed via AVOption as int

2015-03-17 16:52:10 +01:00

vf_fieldmatch.c

avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int

2015-03-17 17:11:42 +01:00

vf_fieldorder.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

vf_format.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fps.c

…

vf_framepack.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_framestep.c

…

vf_frei0r.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fspp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_fspp.h

…

vf_geq.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_gradfun.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_hflip.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_histeq.c

Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats

2015-03-18 01:18:40 +01:00

vf_histogram.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_hqdn3d.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_hqdn3d.h

…

vf_hqx.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_hue.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_idet.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_idet.h

…

vf_il.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_interlace.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_kerndeint.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_lenscorrection.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_libopencv.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_lut3d.c

avfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as int

2015-03-18 12:32:56 +01:00

vf_lut.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_mcdeint.c

avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int

2015-03-20 19:12:57 +01:00

vf_mergeplanes.c

…

vf_mpdecimate.c

avfilter/vf_mpdecimate: Fix missing ()

2015-04-06 02:41:49 +02:00

vf_noise.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_noise.h

…

vf_null.c

…

vf_overlay.c

avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as int

2015-03-20 19:11:58 +01:00

vf_owdenoise.c

avfilter: handle error in query_formats() of a bunch of random video filters

2015-03-16 23:43:12 +01:00

vf_pad.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_palettegen.c

avfilter/palettegen: make sure at least one frame was sent to the filter

2015-03-15 19:09:20 +01:00

vf_paletteuse.c

avfilter/vf_paletteuse: indent fix after 7ccc5848

2015-03-05 16:04:20 +01:00

vf_perspective.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_phase.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pixdesctest.c

…

vf_pp7.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pp7.h

…

vf_pp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_psnr.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pullup.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_pullup.h

…

vf_qp.c

vfilter/vf_qp: Support evaluating expression per MB

2015-03-28 15:18:58 +01:00

vf_removelogo.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_repeatfields.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_rotate.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_sab.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_scale.c

avfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO

2015-04-13 13:45:41 +02:00

vf_separatefields.c

…

vf_setfield.c

avfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int

2015-03-22 17:30:24 +01:00

vf_showinfo.c

vf_showinfo: minimum widths for some early fields

2015-03-04 21:43:42 +01:00

vf_showpalette.c

…

vf_shuffleplanes.c

…

vf_signalstats.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_smartblur.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_spp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_spp.h

…

vf_stereo3d.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_subtitles.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_super2xsai.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_swapuv.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_telecine.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_thumbnail.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_tile.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_tinterlace.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_transpose.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_unsharp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_uspp.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_vflip.c

…

vf_vidstabdetect.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_vidstabtransform.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_vignette.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_w3fdif.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_xbr.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_yadif.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vf_zoompan.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

video.c

…

video.h

…

vidstabutils.c

…

vidstabutils.h

…

vsink_nullsink.c

…

vsrc_cellauto.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vsrc_life.c

avfilter/vsrc_life: Fix mix of declarations and statements

2015-04-09 11:40:44 +02:00

vsrc_mandelbrot.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vsrc_mptestsrc.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

vsrc_testsrc.c

avfilter: handle error in query_formats() in bunch of filters

2015-04-08 13:05:06 +00:00

yadif.h

avfilter/yadif: Change enums to int, which are accessed via AVOption as int

2015-04-05 15:46:11 +02:00