virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
33,792 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
70d9fb6963
Go to file
Michael Niedermayer 70d9fb6963 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sunrast: Check for out of bounds reads
  lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
  lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
  Add libvpx presets.
  doc/avtools: add forgotten part to stream specifiers description
  swscale: prevent overflow during initialization
  g722: Add a fate test for the encoder
  fate: Add a target for creating a 16000 Hz mono synthetic audio file
  macosx: use the default surface on newer sdl

Conflicts:
	ffplay.c
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-19 02:08:59 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
libavdevice AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
libavfilter vf_mp: Fix several incompatible pointer type warnings. 2011-10-19 00:05:30 +02:00
libavformat fix memleak in packet corrupt dropping code 2011-10-18 12:00:48 +02:00
libavutil lavu: update minor number and add APIchanges entry after recent av_strtok() addition 2011-10-18 18:46:52 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
libswscale swscale: prevent overflow during initialization 2011-10-18 10:29:49 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2011-10-13 18:04:02 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
Changelog lavfi: update minor number and add Changelog entry after aevalsrc addition 2011-10-18 18:46:58 +02:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.c cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.h cmdutils.h: Project name cleanup 2011-10-14 02:18:55 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure lavu: add av_strtok() 2011-10-18 18:21:03 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
ffplay.c ffplay: avoid window resize crash on osx with libsdl 1.2.14 2011-10-16 19:28:22 +02:00
ffprobe.c ffprobe: prefer av_freep() over av_free() for global print_format option. 2011-10-18 19:11:05 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.