1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Michael Niedermayer df4517106a Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba'
* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba':
  mpegvideo: reindent

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:08:04 +01:00
compat
doc lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavcodec Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba' 2013-03-13 13:08:04 +01:00
libavdevice bktr: add missing #include for av_gettime() 2013-03-13 10:48:09 +00:00
libavfilter lavfi/fieldorder: add support to named options 2013-03-13 00:37:13 +01:00
libavformat Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530' 2013-03-13 12:55:00 +01:00
libavresample
libavutil Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d' 2013-03-13 02:08:41 +01:00
libpostproc
libswresample
libswscale
presets
tests
tools
.gitignore
arch.mak
Changelog Changelog: fix project name 2013-03-12 21:45:51 +01:00
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 Remove references to the "ff" variant of buffersink. 2013-03-12 23:31:07 +01:00
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4' 2013-03-13 01:31:46 +01:00
ffprobe.c ffprobe: support codec options 2013-03-13 00:34:36 +01:00
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.