[FFmpeg-cvslog] Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 17:04:58 2012 +0200| [13afee951a49964abb6d3e2d11644ac9d5ded2c7] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13afee951a49964abb6d3e2d11644ac9d5ded2c7
---