FFmpeg git repo
Go to file
Michael Niedermayer 2a976debc1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dv: Initialize encoder tables during encoder init.
  dv: Replace some magic numbers by the appropriate #define.
  FATE: pass the decoded output format and audio source file to enc_dec_pcm
  FATE: specify the input format when decoding in enc_dec_pcm()
  x86inc: support AVX abstraction for 2-operand instructions
  configure: detect PGI compiler and set suitable flags
  avconv: check for an incompatible changing channel layout
  avio: make AVIOContext.av_class pointer to const
  nutdec: add malloc check and fix const to non-const conversion warnings

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-19 21:23:52 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-04-17 12:13:22 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
libavdevice
libavfilter yadif: Improve pts calculation for is_second. 2012-04-17 19:41:16 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
libpostproc
libswresample
libswscale
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +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.