[FFmpeg-cvslog] Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 02:41:18 2013 +0100| [d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4] | committer: Michael Niedermayer

Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'

* commit '0517c9e098092709397cc522c59fa63c83cc81be':
  lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft

Conflicts:
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/resample.c
	libavcodec/resample2.c
	libavcodec/version.h

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

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