generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
64,178 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
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 compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
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 lavd/avfoundation: Support user selected pixel formats and pixel format autoselection. 2014-06-12 21:31:25 +02:00
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 Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996' 2014-06-23 14:52:54 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
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 presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests fate/filter-video: fix hqx on big endian part 2 2014-06-22 05:02:04 +02:00
tools tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB 2014-06-10 04:00:06 +02:00
.gitignore Remove avserver. 2014-06-18 14:55:28 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c version string: add copyright line to version string 2014-06-16 10:24:28 -08:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765' 2014-06-23 13:31:26 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffmpeg_opt.c ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams 2014-06-18 21:35:54 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: fix reinitializing with threads while flushing 2014-06-23 00:09:09 +02:00
ffmpeg.h ffmpeg: support setting AVStream.discard 2014-06-07 21:26:22 +02:00
ffplay.c ffplay: remove -ec handling code 2014-06-17 17:31:29 +02:00
ffprobe.c ffprobe: add rc_max_rate to stream output 2014-06-09 23:19:33 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
Makefile Remove avserver. 2014-06-18 14:55:28 +02:00
README.md README: add markdown syntax 2014-05-28 22:38:11 +02:00
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

README.md

FFmpeg README

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