RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 18:32:22 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
63,561 Commits 37 Branches 400 Tags 246 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
e46cc1dab0
Go to file
Michael Niedermayer e46cc1dab0 Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a' 
* commit '43e7f0797f9f821a3866a20f05e512e13c82076a':
  flvenc: only write the framerate tag based on avg_frame_rate

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/seek/lavf-flv_fmt
	tests/ref/seek/vsynth2-flv
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29 13:30:12 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
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 '43e7f0797f9f821a3866a20f05e512e13c82076a' 2014-05-29 13:30:12 +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 flvenc: only write the framerate tag based on avg_frame_rate 2014-05-29 08:01:30 +02:00
tools
.gitignore
arch.mak
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
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: use thread message API. 2014-05-26 11:40:21 +02:00
ffmpeg.h ffmpeg: use thread message API. 2014-05-26 11:40:21 +02:00
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 MAINTAINERS: add Trac maintainers 2014-05-26 12:18:29 -08:00
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.