FFmpeg/libavfilter
Michael Niedermayer 46a35959d8 Merge commit '7751e4693d'
* commit '7751e4693d':
  ogg: check that the expected number of headers had been parsed
  libx264: change default to closed gop to match x264cli
  Use avcodec_free_frame() to free AVFrames.
  lavf: use a malloced AVFrame in try_decode_frame().
  lavc: add avcodec_free_frame().
  lavc: ensure extended_data is set properly on decoding
  lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
  lavc: use av_mallocz to allocate AVFrames.
  lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/src_movie.c
	libavformat/oggdec.c
	libavformat/oggdec.h
	libavformat/oggparsetheora.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25 15:15:16 +02:00
..
libmpcodecs lavfi/mp: drop rotate wrapper 2012-09-06 11:27:22 +02:00
x86 hqdn3d: Fix out of array read in LOWPASS 2012-09-22 03:17:28 +02:00
af_aconvert.c
af_aformat.c
af_amerge.c lavfi/amerge: clarify the error message in case of input overlap 2012-09-11 18:58:19 +02:00
af_amix.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
af_anull.c
af_aresample.c lavfi/aresample: set buffer properties after copy. 2012-09-13 12:05:19 +02:00
af_asetnsamples.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
af_ashowinfo.c
af_astreamsync.c
af_asyncts.c Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
af_atempo.c lavfi/af_atempo: use av_malloc for rDFT buffers. 2012-08-29 18:19:41 +02:00
af_channelmap.c
af_channelsplit.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
af_earwax.c
af_join.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
af_pan.c af_pan: Fix sscanf formats to work with buggy sscanf implementations 2012-09-15 19:49:34 -04:00
af_resample.c
af_silencedetect.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
af_volume.c
af_volumedetect.c
all_channel_layouts.inc
allfilters.c lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
asink_anullsink.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
asrc_abuffer.h
asrc_aevalsrc.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
asrc_anullsrc.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
asrc_flite.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
audio.c lavfi: check that buffer and link properties match. 2012-09-13 20:09:53 +02:00
audio.h
avcodec.c lavfi/avcodec: apply cosmetics style fixes 2012-09-14 11:06:40 +02:00
avcodec.h
avf_concat.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
avf_showspectrum.c lavfi/showspectrum: add priv_class and flags to options 2012-08-21 01:29:25 +02:00
avf_showwaves.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
avfilter.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
avfilter.h lavfi: drop deprecated and pointless avfilter_default_end_frame() function 2012-09-09 10:57:28 +02:00
avfiltergraph.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c lavfi: add qp_table_size 2012-09-07 13:00:47 +02:00
bufferqueue.h
buffersink.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
buffersink.h
buffersrc.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
buffersrc.h Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
drawutils.c
drawutils.h
f_sendcmd.c lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
f_setpts.c lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio 2012-09-10 18:52:28 +02:00
f_settb.c
fifo.c
filtfmts.c libavfilter/filtfmts: fix argv/argc checks 2012-09-19 22:43:03 +02:00
formats.c
formats.h
gradfun.h
graphdump.c
graphparser.c
internal.h
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
sink_buffer.c lavfi/buffersink: fix check on pixel_fmts in the opaque parameter 2012-09-22 10:59:40 +02:00
split.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
src_buffer.c
src_movie.c Merge commit '7751e4693d' 2012-09-25 15:15:16 +02:00
transform.c
transform.h
version.h lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
vf_alphaextract.c
vf_alphamerge.c
vf_aspect.c
vf_ass.c lavfi/ass: mark ass_libavfilter_log_level_map as static const. 2012-09-16 02:59:43 +02:00
vf_bbox.c
vf_blackdetect.c
vf_blackframe.c
vf_boxblur.c lavfi: drop deprecated and pointless avfilter_default_end_frame() function 2012-09-09 10:57:28 +02:00
vf_colormatrix.c vf_colormatrix: Drop unused strings.h header 2012-09-07 18:24:43 +02:00
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_decimate.c lavfi: port decimate libmpcodecs filter 2012-08-31 16:04:37 +02:00
vf_delogo.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vf_deshake.c
vf_drawbox.c
vf_drawtext.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vf_edgedetect.c lavfi/edgedetect: use "@see" instead of the invalid "@url". 2012-08-20 23:12:34 +02:00
vf_fade.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vf_fieldorder.c
vf_format.c
vf_fps.c
vf_framestep.c vf_framestep: fix uninitilaized variable bug 2012-08-30 05:09:15 +02:00
vf_frei0r.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c hqdn3d: Fix out of array read in LOWPASS 2012-09-22 03:17:28 +02:00
vf_hue.c lavfi/hue: simplify/fix setting logic in set_options() 2012-09-23 00:46:33 +02:00
vf_idet.c vf_idet: Remove emms 2012-09-07 20:08:12 +02:00
vf_libopencv.c
vf_lut.c Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_* 2012-08-31 23:27:21 +02:00
vf_mp.c lavfi/mp: drop rotate wrapper 2012-09-06 11:27:22 +02:00
vf_null.c
vf_overlay.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vf_pad.c
vf_pixdesctest.c
vf_removelogo.c
vf_scale.c vf_scale: fix incompatible pointer type warning 2012-09-05 18:31:18 +02:00
vf_select.c lavfi/select: make lavc dependency optional. 2012-09-20 18:45:47 +02:00
vf_setfield.c
vf_showinfo.c
vf_slicify.c
vf_smartblur.c lavfi: add smartblur filter 2012-08-28 19:48:16 +02:00
vf_super2xsai.c
vf_swapuv.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c lavfi/tinterlace: declare source buffers in copy_picture_field() as const 2012-09-06 00:40:01 +02:00
vf_transpose.c lavfi/transpose: implement landscape passthrough mode 2012-09-04 11:39:23 +02:00
vf_unsharp.c
vf_vflip.c
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
video.c lavfi: check that buffer and link properties match. 2012-09-13 20:09:53 +02:00
video.h
vsink_nullsink.c Merge commit '23aae62c2c' 2012-09-18 14:45:44 +02:00
vsrc_cellauto.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vsrc_life.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vsrc_mandelbrot.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vsrc_mptestsrc.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
vsrc_testsrc.c vsrc_testsrc: Fix case without a specified duration 2012-09-21 03:00:15 +02:00
yadif.h