Files · 241913c0d041e09ddded851a47e0a4a7d6f88561 · Linshizhi / ffmpeg.wasm-core

Merge remote-tracking branch 'cehoyos/master' · 241913c0

Michael Niedermayer authored Apr 04, 2015

* cehoyos/master:
  Fix codec fps diplay for very small fps.
  lavf/mpeg: Support alaw in Hikvision CCTV recordings.
  lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

241913c0

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...
.gitattributes		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.md		Loading commit data...
LICENSE.md		Loading commit data...
MAINTAINERS		Loading commit data...
Makefile		Loading commit data...
README.md		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...
cmdutils_opencl.c		Loading commit data...
common.mak		Loading commit data...
configure		Loading commit data...
ffmpeg.c		Loading commit data...
ffmpeg.h		Loading commit data...
ffmpeg_dxva2.c		Loading commit data...
ffmpeg_filter.c		Loading commit data...
ffmpeg_opt.c		Loading commit data...
ffmpeg_vda.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...
ffserver_config.c		Loading commit data...
ffserver_config.h		Loading commit data...
library.mak		Loading commit data...
version.sh		Loading commit data...

README.md