1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 05507348af Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-30 12:58:24 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc doc/encoders: reformat and add some clarification in libtwolame doc 2013-08-30 11:37:07 +02:00
libavcodec Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4' 2013-08-30 12:50:01 +02:00
libavdevice
libavfilter avfilter/vf_fps: fix ABI compatibility with AV_NOPTS starttime 2013-08-29 13:12:09 +02:00
libavformat Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa' 2013-08-29 13:43:07 +02:00
libavresample
libavutil Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b' 2013-08-30 11:57:35 +02:00
libpostproc
libswresample
libswscale Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b' 2013-08-30 11:57:35 +02:00
presets
tests matroskaenc: Fix writing TRACKDEFAULTFLAG 2013-08-27 14:00:31 +02:00
tools tools/graph2dot: fix use of deprecated *put_count 2013-08-25 19:37:37 +02:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c cmdutils: Filter non user AVOptions out from what can be set over the command line. 2013-08-28 00:25:13 +02:00
cmdutils.h
common.mak
configure Merge commit '84146963d23d76b09af633e97413cd97d9b3021e' 2013-08-29 13:52:09 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: make next_nb_channels[] static const 2013-08-24 19:53:11 +02:00
ffprobe.c
ffserver.c
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.