virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
64,178 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
957457a044
Go to file
Michael Niedermayer 957457a044 Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996' 
* commit 'ccda51b14c0fcae2fad73a24872dce75a7964996':
  lzo: Handle integer overflow

Conflicts:
	libavutil/lzo.c

This is basically not merging changes due to this being fixed differently
in FFmpeg

See: d6af26c55c
See: cf2b7c01f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 14:52:54 +02:00
compat
doc Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed' 2014-06-23 01:30:35 +02:00
libavcodec Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735' 2014-06-23 13:56:52 +02:00
libavdevice
libavfilter avfilter/vf_blend: fix macro () 2014-06-22 20:49:00 +02:00
libavformat Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28' 2014-06-23 03:34:13 +02:00
libavresample
libavutil Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996' 2014-06-23 14:52:54 +02:00
libpostproc
libswresample swr: remove another forgotten division in DSP function. 2014-06-22 05:20:22 +02:00
libswscale swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding 2014-06-22 03:09:28 +02:00
presets
tests fate/filter-video: fix hqx on big endian part 2 2014-06-22 05:02:04 +02:00
tools
.gitignore
arch.mak
Changelog avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765' 2014-06-23 13:31:26 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix reinitializing with threads while flushing 2014-06-23 00:09:09 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
Makefile
README.md
RELEASE
version.sh

README.md

FFmpeg README

  1. Documentation
  1. Licensing
  • See the LICENSE file.
  1. Build and Install
  • See the INSTALL file.