Go to file
Michael Niedermayer e847f41285 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libspeexenc: add supported sample rates and channel layouts.
  Replace usleep() calls with av_usleep()
  lavu: add av_usleep() function
  utvideo: mark interlaced frames as such
  utvideo: Fix interlaced prediction for RGB utvideo.
  cosmetics: do not use full path for local headers
  lavu/file: include unistd.h only when available
  configure: check for unistd.h
  log: include unistd.h only when needed
  lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/utvideo.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22 22:34:02 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
libavdevice lavd/lavfi: do not set the channel layout list. 2012-06-21 19:40:49 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-06-21 22:37:43 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swresample: make .class_name more descriptive 2012-06-22 14:01:15 +00:00
libswscale swscale: use designated initializers for AVClass 2012-06-22 02:34:34 +00:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: add tests for SANM and VIMA 2012-06-22 00:16:03 +00:00
tools Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog LucasArts SMUSH demuxer 2012-06-21 02:27:53 +00:00
cmdutils_common_opts.h
cmdutils.c cmdutils: dont return void from a void function 2012-06-10 02:38:01 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
ffprobe.c ffprobe: dump AVPacket.convergence_duration. 2012-06-18 09:39:17 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: reorganize entries in the libavfilter section 2012-06-17 22:17:44 +02:00
Makefile Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
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.