FFmpeg/libavcodec
Michael Niedermayer d3edc65dd1 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@gmx.at>
2013-03-13 02:41:18 +01:00
..
2013-02-21 23:06:30 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-12 18:24:49 +01:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2013-03-05 03:29:04 +01:00
2013-03-12 12:17:58 +01:00
2013-02-03 13:08:36 +01:00
2013-03-12 18:10:09 +01:00
2013-02-09 14:22:29 +01:00
2013-03-12 10:35:51 +01:00