1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 06a8350599 Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:37:03 +01:00
compat
doc
libavcodec lavc: remove disabled 8SVX_RAW cruft 2013-03-13 11:17:09 +00:00
libavdevice bktr: add missing #include for av_gettime() 2013-03-13 10:48:09 +00:00
libavfilter
libavformat Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292' 2013-03-13 12:37:03 +01:00
libavresample
libavutil
libpostproc
libswresample
libswscale
presets
tests
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c opt: re-enable memleak fix for duplicated options. 2013-03-13 07:25:16 +01:00
cmdutils.h
common.mak
configure mjpeg: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:10 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c opt: re-enable memleak fix for duplicated options. 2013-03-13 07:25:16 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
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.