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
28,604 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%
2fd41c9067
Go to file
Michael Niedermayer 2fd41c9067 Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  avio: make udp_set_remote_url/get_local_port internal.
  asfdec: also subtract preroll when reading simple index object
  matroskaenc: remove a variable that's unused after bc17bd9.
  avio: cosmetics - nicer vertical alignment.
  Remove unnecessary icc version checks
  Disable 'attribute "foo" ignored' warnings from icc
  rtsp: Don't use a locale dependent format string
  Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
  configure: get libavcodec version from new version.h header
  lavc: move the version macros to a new installed header.
  matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
  Do not use format string "%0.3f" for RTSP Range field.
  Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
  Document usage of import libraries created by dlltool
  configure: Set the correct lib target for arm/wince dlltool
  fate: simplify regression-funcs.sh
  fate: add support for multithread testing

Conflicts:
	libavformat/rtspdec.c
	libavutil/attributes.h
	libavutil/internal.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-24 02:16:11 +01:00
doc Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-09 03:33:56 +01:00
libavcodec Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
libavdevice Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavfilter Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavformat Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
libavutil Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mt-work Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01:00
tests Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
tools Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
.gitignore consolidate .gitignore patters into a single file 2011-01-18 21:32:05 +01:00
Changelog Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
cmdutils_common_opts.h Implement a -pix_fmts option for listing all the supported pixel 2009-12-21 21:53:03 +00:00
cmdutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cmdutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.mak Merge libavcore into libavutil 2011-02-16 23:00:30 +01:00
configure Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-03-21 16:45:21 +01:00
ffserver.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS Delete MAINTAINERS file 2011-03-14 21:13:27 +00:00
Makefile Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak fix building test programs with gnu make 3.82 2010-12-07 16:42:25 +00:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.