Michael Niedermayer 75647622b5 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>

2015-05-28 21:48:49 +02:00

2.7 KiB

Raw Blame History

View Raw