FFmpeg git repo
Go to file
Michael Niedermayer 92ef4be4ab Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/libopenjpegdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-22 22:26:42 +02:00
doc lavfi/setfield: add "progressive" option 2012-04-21 10:09:49 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
libavdevice
libavfilter lavfi/setfield: remove stray argument in av_log() 2012-04-21 12:32:50 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
libpostproc
libswresample fix swr_convert buffering of packed audio 2012-04-21 01:57:21 +02:00
libswscale sws: remove cliping in yuv2rgb code. 2012-04-15 23:38:42 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog
Doxyfile
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
cmdutils.h Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
ffmpeg.c ffmpeg: assert the refcount of decoded frames 2012-04-22 20:10:00 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
ffprobe.c ffprobe: do not try to decode empty packets. 2012-04-21 14:02:08 +02:00
ffserver.c
library.mak
version.sh

README

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.