FFmpeg git repo
Go to file
Michael Niedermayer 376b16d7cc Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'
* commit '0db2d94280e260af5f3ad7993c5a6357462f17c9':
  dsputil: workaround __VA_ARGS__ missing tokenization for MSVC
  configure: add section for libc-specific hacks
  build: disable ranlib on mingw
  parser: Don't use pc as context for av_dlog
  h264: Remove an assert on current_picture_ptr being null

Conflicts:
	configure
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-06 16:05:40 +02:00
compat
doc lavfi/mp: drop rotate wrapper 2012-09-06 11:27:22 +02:00
libavcodec Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9' 2012-09-06 16:05:40 +02:00
libavdevice Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libavfilter lavfi/mp: drop rotate wrapper 2012-09-06 11:27:22 +02:00
libavformat eliminate some mingw warnings 2012-09-06 04:42:43 +02:00
libavresample Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a' 2012-09-05 14:44:05 +02:00
libavutil lavu/parseutils: add av_small_strptime() 2012-09-06 00:40:01 +02:00
libpostproc
libswresample Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libswscale Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
mt-work
presets
tests tests/lavfi-regression: name temporary files after $testname in do_lavfi_pixfmts() 2012-09-06 01:09:36 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
.gitignore examples: add demuxing.c example 2012-09-02 10:48:01 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: port decimate libmpcodecs filter 2012-08-31 16:04:37 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
cmdutils.h Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
cmdutils_common_opts.h
common.mak
configure Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9' 2012-09-06 16:05:40 +02:00
ffmpeg.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
ffmpeg.h Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
ffmpeg_filter.c avoid ambigous buffersink names 2012-09-01 06:05:08 +02:00
ffmpeg_opt.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
ffplay.c Merge remote-tracking branch 'cus/stable' 2012-09-01 14:59:08 +02:00
ffprobe.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
ffserver.c
library.mak
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.