Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 19:48:49 +0000 (21:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 19:48:49 +0000 (21:48 +0200)
commit75647622b530e8ec98ce364c9d6c38ca1b292e6d
tree4dee7cfdf6f30f1239b577985bc22a7ca80c7e2a
parent68cce0101df074c41d2f4cfc8a9a36a000a8393e
parent6f57375d707de40dcec28d3cef886c364e032c21
Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'

* commit '6f57375d707de40dcec28d3cef886c364e032c21':
  rl: Rename ff_*_rl() to ff_rl_*()

Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/rl.c
libavcodec/rl.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h261.c
libavcodec/ituh263dec.c
libavcodec/ituh263enc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpeg4videoenc.c
libavcodec/msmpeg4dec.c
libavcodec/msmpeg4enc.c
libavcodec/rl.c
libavcodec/rl.h