aboutsummaryrefslogtreecommitdiff
path: root/common.mak
diff options
context:
space:
mode:
authorMichael Niedermayer2015-05-28 21:48:49 +0200
committerMichael Niedermayer2015-05-28 21:48:49 +0200
commit75647622b530e8ec98ce364c9d6c38ca1b292e6d (patch)
tree4dee7cfdf6f30f1239b577985bc22a7ca80c7e2a /common.mak
parent68cce0101df074c41d2f4cfc8a9a36a000a8393e (diff)
parent6f57375d707de40dcec28d3cef886c364e032c21 (diff)
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>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions