virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
63,669 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
862120f980
Go to file
Michael Niedermayer 862120f980 Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d' 
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
  avconv: do not use the stream codec context for encoding

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:53:23 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6' 2014-06-01 13:46:38 +02:00
libavcodec Merge commit 'ed39cda02923316b6710c1bcc34d3445370be5b4' 2014-06-01 13:55:49 +02:00
libavdevice avdevice/v4l2: Use av_malloc_array() 2014-05-22 15:08:12 +02:00
libavfilter Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998' 2014-05-29 01:24:48 +02:00
libavformat Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52' 2014-06-01 14:16:29 +02:00
libavresample Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88' 2014-06-01 13:18:32 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample: add swri_resample_float_avx 2014-05-16 05:27:03 +02:00
libswscale sws: document color range >8bit oddity 2014-05-21 21:29:33 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests tests: Add MPEG4 nsse test 2014-05-30 15:43:04 +02:00
tools tools: Use av_gettime_relative() 2014-05-17 15:51:58 +02:00
.gitignore gitignore: add tools/uncoded_frame 2014-05-06 14:14:32 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog avcodec/webvttenc: add webvtt encoder 2014-05-25 03:04:14 +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 ffmpeg: add -devices param 2014-05-28 03:52:50 +02: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 '368f50359eb328b0b9d67451f56fda20b3255f9a' 2014-05-30 02:43:34 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
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 Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d' 2014-06-01 15:53:23 +02:00
ffmpeg_opt.c Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d' 2014-06-01 15:53:23 +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 Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d' 2014-06-01 15:53:23 +02:00
ffmpeg.h Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d' 2014-06-01 15:53:23 +02:00
ffplay.c ffplay: support rotated video. 2014-05-23 23:30:21 +02:00
ffprobe.c ffprobe: Use av_malloc_array() 2014-05-21 15:59:22 +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 libavformat: output cues for each subtitle block in MKV muxer 2014-05-31 13:26:48 +02:00
Makefile Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f' 2014-05-15 21:01:07 +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.