[FFmpeg-cvslog] Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 15 21:01:07 2014 +0200| [fcb5849a62e5e6aac8fe6203443105f6dd46cbf6] | committer: Michael Niedermayer

Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
  build: add avresample after avcodec to FFLIBS

Conflicts:
	Makefile

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

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