FFmpeg git repo
Go to file
Michael Niedermayer f9d5bdd0f6 Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e':
  loco: return meaningful error codes.
  flicvideo: return meaningful error codes.
  vcr1: remove disabled encoder stub

Conflicts:
	libavcodec/flicvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 15:36:35 +01:00
compat
doc Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec' 2013-01-14 13:29:00 +01:00
libavcodec Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e' 2013-01-14 15:36:35 +01:00
libavdevice Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1' 2013-01-14 14:16:21 +01:00
libavfilter Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de' 2013-01-14 14:43:32 +01:00
libavformat rtmpproto: Fix assignments in if() 2013-01-14 05:05:42 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-01-12 13:42:42 +01:00
libpostproc
libswresample swr/dither: fix division by 0 2013-01-14 02:57:00 +01:00
libswscale
presets
tests Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8' 2013-01-13 13:54:52 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec' 2013-01-14 13:29:00 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak
configure Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33' 2013-01-14 14:00:21 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases 2013-01-13 15:09:09 +01:00
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: fix sws_flags 2013-01-13 22:48:28 +01: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.