[FFmpeg-cvslog] Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 21 11:24:11 2015 +0100| [66d79aa2e1351ac38f3469bba6a8b1fcaefa0c20] | committer: Michael Niedermayer

Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'

* commit '9abc80f1ed673141326341e26a05c3e1f78576d0':
  libavcodec: Make use of av_clip functions

Conflicts:
	libavcodec/takdec.c

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

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