Files · ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59 · Linshizhi / ffmpeg.wasm-core

Merge remote-tracking branch 'qatar/master' · ccdfa3e2

Michael Niedermayer authored Nov 24, 2013

* 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>

ccdfa3e2

Name	Last commit	Last update
compat		Loading commit data...
doc		Loading commit data...
libavcodec		Loading commit data...
libavdevice		Loading commit data...
libavfilter		Loading commit data...
libavformat		Loading commit data...
libavresample		Loading commit data...
libavutil		Loading commit data...
libpostproc		Loading commit data...
libswresample		Loading commit data...
libswscale		Loading commit data...
presets		Loading commit data...
tests		Loading commit data...
tools		Loading commit data...
.gitignore		Loading commit data...
COPYING.GPLv2		Loading commit data...
COPYING.GPLv3		Loading commit data...
COPYING.LGPLv2.1		Loading commit data...
COPYING.LGPLv3		Loading commit data...
CREDITS		Loading commit data...
Changelog		Loading commit data...
INSTALL		Loading commit data...
LICENSE		Loading commit data...
MAINTAINERS		Loading commit data...
Makefile		Loading commit data...
README		Loading commit data...
RELEASE		Loading commit data...
arch.mak		Loading commit data...
cmdutils.c		Loading commit data...
cmdutils.h		Loading commit data...
cmdutils_common_opts.h		Loading commit data...
common.mak		Loading commit data...
configure		Loading commit data...
ffmpeg.c		Loading commit data...
ffmpeg.h		Loading commit data...
ffmpeg_filter.c		Loading commit data...
ffmpeg_opt.c		Loading commit data...
ffmpeg_vdpau.c		Loading commit data...
ffplay.c		Loading commit data...
ffprobe.c		Loading commit data...
ffserver.c		Loading commit data...
library.mak		Loading commit data...
version.sh		Loading commit data...

README