Changeset ccdfa3e in ffmpeg

Timestamp:

Nov 24, 2013, 4:21:19 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e043298c

Parents:

f67ec7f3 (diff), 8f8bc92 (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: Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:

ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c

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

(No files)