Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 15:04:58 +0000 (17:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 15:04:58 +0000 (17:04 +0200)
commit13afee951a49964abb6d3e2d11644ac9d5ded2c7
treeba98a70ac6f80dea08f21badfbbb64319541d826
parentaf7dd79a323090b14a7fb9ef24a3f6a24dc6d2db
parent59ee9f78b0cc4fb84ae606fa317d8102ad32a627
Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
  lavfi: do not use av_pix_fmt_descriptors directly.

Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
25 files changed:
libavfilter/avfilter.c
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/formats.c
libavfilter/vf_boxblur.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.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/video.c