FFmpeg git repo
Go to file
Michael Niedermayer e63ebaca16 Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'
* commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a':
  win32: Allow other programs to open the same files
  configure: Add error_resilience as dependency to the eatqi decoder

Conflicts:
	configure
	libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 12:20:41 +01:00
compat
doc doc: "av* tools" -> "ff* tools". 2013-03-27 01:44:20 +01:00
libavcodec Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3' 2013-03-28 12:07:38 +01:00
libavdevice dshow_pin: dont return a value from a void function 2013-03-25 22:12:07 +01:00
libavfilter vsrc_mandelbrot: Mandel morphing support 2013-03-27 19:27:37 +01:00
libavformat estimate_timings_from_bit_rate: Check timebase and bitrate 2013-03-28 01:45:01 +01:00
libavresample Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
libavutil Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01: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 tests/tiny_ssim: include the 2 macros instead of a header 2013-03-27 01:38:18 +01: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
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a' 2013-03-28 12:20:41 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: avoid strcpy() 2013-03-26 01:51:19 +01:00
ffmpeg.c Call do_video_stats when duplicating frame 2013-03-23 12:29:12 +01:00
ffmpeg.h ffmpeg: Correct inter stream timestamp discontinuities 2013-03-23 04:53:44 +01:00
ffplay.c
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
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

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.