virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
40,065 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
92ef4be4ab
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 Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog lavfi: port 2xsai filter from libmpcodecs 2012-04-13 00:14:06 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
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
common.mak Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
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 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 Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
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.