FFmpeg git repo
Go to file
Michael Niedermayer 5fb652dddb Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'
* commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93':
  oma: correctly mark and decrypt partial packets

Conflicts:
	libavformat/omadec.c

See: dcd013a535
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 13:01:20 +02:00
compat
doc ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
libavcodec Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f' 2013-07-29 12:09:38 +02:00
libavdevice avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE 2013-07-26 15:21:25 +00:00
libavfilter Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
libavformat Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93' 2013-07-29 13:01:20 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
libavutil Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
libpostproc
libswresample
libswscale swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
presets
tests ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a' 2013-07-27 09:13:07 +02:00
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c Merge remote-tracking branch 'qatar/master' 2013-07-26 11:12:11 +02:00
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +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.