RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 10:52:20 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
51,567 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%
e7389ed5d0
Go to file
Michael Niedermayer e7389ed5d0 Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
compat
doc Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 2013-04-04 13:00:59 +02:00
libavcodec doc: Fix best_nb_channells typo 2013-04-04 07:51:28 +02:00
libavdevice lavd/v4l2: fully init an ioctl argument. 2013-04-01 10:38:14 +02:00
libavfilter lavfi/af_atempo: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
libavformat Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 2013-04-04 13:00:59 +02:00
libavresample Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
libavutil Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 2013-04-04 13:00:59 +02:00
libpostproc libpostproc: silence valgrind/fate warning about using uninitialized data 2013-03-25 21:48:45 +01:00
libswresample
libswscale Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
presets
tests lavc: do not init frame with guessed layout. 2013-04-03 17:44:10 +02:00
tools tools: add audio normalize script example. 2013-03-26 01:50:13 +01:00
.gitignore tools: add tiny_ssim 2013-03-26 17:31:41 +01:00
arch.mak
Changelog aphaser filter 2013-04-03 08:33:59 +00:00
cmdutils_common_opts.h cmdutils_common_opts: fix loglevel help text as its inaccurate 2013-03-31 18:06:18 +02:00
cmdutils.c cmdutils: fix build with --disable-avfilter. 2013-04-01 19:56:59 +02:00
cmdutils.h cmdutils: avtool -> fftool 2013-03-31 18:22:23 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure Merge commit 'fc43c19a567aa945398dccb491d972c11ec2a065' 2013-04-04 12:39:18 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg/avformat: factor av_guess_frame_rate() out 2013-03-29 17:40:28 +01:00
ffmpeg_opt.c Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c' 2013-03-28 13:00:39 +01:00
ffmpeg.c Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed. 2013-04-04 00:01:34 +02:00
ffmpeg.h Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c' 2013-03-28 13:00:39 +01:00
ffplay.c ffplay: use seek per time for ogg by default 2013-04-02 01:36:45 +02:00
ffprobe.c
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE LICENSE: add libutvideo in the GPL libraries list. 2013-03-29 02:08:20 +01:00
MAINTAINERS Update MAINTAINERS with information about avisynth demuxer. 2013-03-27 03:47:56 +01:00
Makefile Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3' 2013-03-28 12:07:38 +01:00
README
RELEASE
version.sh

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.