virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
63,557 Commits 37 Branches 400 Tags 462 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
bc59d39b82
Go to file
Michael Niedermayer bc59d39b82 Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3' 
* commit '81eec081afea9fc017a175581ceea7c420a0dfc3':
  matroskaenc: base DefaultDuration on the framerate, not the codec timebase

Conflicts:
	libavformat/matroskaenc.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

See: ea83b032af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29 12:58:55 +02:00
compat
doc avformat/nutenc: add mode that omits the index 2014-05-29 03:37:37 +02:00
libavcodec libavcodec/x86/dsputilenc: drop and 0xffff that should have becomei redundant 2014-05-29 00:16:52 +02:00
libavdevice
libavfilter Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998' 2014-05-29 01:24:48 +02:00
libavformat Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3' 2014-05-29 12:58:55 +02:00
libavresample Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd' 2014-05-29 12:35:02 +02:00
libpostproc
libswresample
libswscale
presets
tests matroskaenc: base DefaultDuration on the framerate, not the codec timebase 2014-05-29 08:00:57 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c
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
configure Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c' 2014-05-28 00:03:59 +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.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS
Makefile
README.md README: add markdown syntax 2014-05-28 22:38:11 +02:00
RELEASE
version.sh

README.md

FFmpeg README

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