Changeset 7026d8a in ffmpeg

Timestamp:

May 28, 2015, 8:02:41 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b666e81c

Parents:

c508fef3 (diff), 1b1bb2c4 (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 '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'

• commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1': rl: Add error checking to ff_rl_init().

Conflicts:

libavcodec/rl.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)