RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
63,669 Commits 37 Branches 400 Tags 244 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
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
libavfilter
libavformat Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52' 2014-06-01 14:16:29 +02:00
libavresample
libavutil Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88' 2014-06-01 13:18:32 +02:00
libpostproc
libswresample
libswscale
presets
tests tests: Add MPEG4 nsse test 2014-05-30 15:43:04 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a' 2014-05-30 02:43:34 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
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
ffmpeg_vdpau.c
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
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS libavformat: output cues for each subtitle block in MKV muxer 2014-05-31 13:26:48 +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.