Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:24:11 +0000 (11:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 10:27:24 +0000 (11:27 +0100)
commit66d79aa2e1351ac38f3469bba6a8b1fcaefa0c20
treec078cd42cba697c15473aeaae0a127bd0e64a74a
parent1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee
parent9abc80f1ed673141326341e26a05c3e1f78576d0
Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'

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

Conflicts:
libavcodec/takdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
libavcodec/aaccoder.c
libavcodec/ac3dsp.c
libavcodec/cavs.c
libavcodec/g722dec.c
libavcodec/g722enc.c
libavcodec/g726.c
libavcodec/h264_direct.c
libavcodec/h264_slice.c
libavcodec/motionpixels.c
libavcodec/opus_celt.c
libavcodec/opus_silk.c
libavcodec/takdec.c
libavcodec/vc1dec.c