Changeset ca7fa3a5 in ffmpeg

Timestamp:

May 28, 2012, 8:07:34 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d187e761

Parents:

f2bc2e8 (diff), 0426c693 (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 remote-tracking branch 'qatar/master'

• qatar/master: AVOptions: fix the value printed in out of range error message.

Conflicts:

libavutil/opt.c

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

(No files)