Changeset 75647622 in ffmpeg

Timestamp:

May 28, 2015, 7:48:49 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c508fef3

Parents:

68cce010 (diff), 6f57375d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)