1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer a3d9a21683 Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'
* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f5520

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 12:28:07 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
doc Update back for git master 2013-07-10 03:14:23 +02:00
libavcodec Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7' 2013-07-10 12:28:07 +02:00
libavdevice avformat/AVFormatContext: Move fields down to match the fork 2013-07-09 19:06:32 +02:00
libavfilter avfilter/graphparse: Fix build with --enable-incompatible-fork-abi 2013-07-09 19:06:32 +02:00
libavformat avformat/utils: avformat_find_stream_info fix a crash in case of oom 2013-07-10 03:42:06 +02:00
libavresample
libavutil Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e' 2013-07-07 11:26:28 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
libswscale swscale: treat gray as a fullrage (0-255) format 2013-07-08 15:21:48 +02:00
presets
tests tests/fate/filter-audio: update asyncts reference 2013-07-08 19:44:27 +02:00
tools Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d' 2013-07-07 11:35:59 +02:00
.gitignore
arch.mak
Changelog Changelog: add back the <next> placeholder for new changes 2013-07-10 03:14:33 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: replace exit() by exit_program() 2013-07-08 11:12:32 +02:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2013-07-05 13:11:06 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: replace exit() by exit_program() 2013-07-08 11:09:22 +02:00
ffmpeg_opt.c ffmpeg_opt: do not warn about unused gop_timecode 2013-07-09 10:54:40 +02:00
ffmpeg.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffmpeg.h
ffplay.c ffplay: assume 0 stream start time if start time is unset in duration check 2013-07-09 20:19:54 +02:00
ffprobe.c Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +02:00
INSTALL
library.mak
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS MAINTAINERS: Update which releases are supported 2013-07-10 00:47:01 +02:00
Makefile
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
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.