ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu May 28
21:48:49 2015 +0200| [75647622b530e8ec98ce364c9d6c38ca1b292e6d] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75647622b530e8ec98ce364c9d6c38ca1b292e6d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
