generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,912 Commits 24 Branches 241 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 1a34478b71 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix NASM include directive
  dsputil_mmx: Honor HAVE_AMD3DNOW
  lavf,lavd: remove all usage of AVFormatParameters from demuxers.
  jack: add 'channels' private option.
  VC-1: fix reading of custom PAR.
  Remove redundant and dubious video codec detection by its extradata
  mpeg12: remove repeat-field code disabled since May 2002
  patch checklist: suggest fate instead of regression tests
  Turn on resampling on sudden size change instead of bailing out during recode.
  avtools: reinitialise filter chain when input video stream changes dimensions

Conflicts:
	Makefile
	avconv.c
	doc/developer.texi
	ffplay.c
	libavcodec/x86/dsputil_mmx.c
	libavdevice/libdc1394.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-15 23:35:53 +02:00
doc
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
ffpresets
Remove libx264 baseline ffpreset
2011-07-28 01:44:57 +02:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
libavdevice
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
libavfilter
af_aformat: hotfix compile due to strsep()
2011-08-15 03:35:25 +02:00
libavformat
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
libavutil
fifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()
2011-08-14 01:56:28 +02:00
libpostproc
Merge remote-tracking branch 'qatar/master'
2011-07-06 23:57:11 +02:00
libswscale
sws: remove hScale16NX_c()
2011-08-14 19:34:48 +02:00
mt-work
Update todo
2011-06-12 18:01:29 +02:00
tests
fate: allow specifying the tool to use for fate (avconv / ffmpeg)
2011-08-15 23:11:46 +02:00
tools
lavfi-showfiltfmts: extend output format for specifying audio data
2011-07-28 10:04:09 +02:00
.gitignore
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
2011-08-13 02:56:08 +02:00
avconv.c
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
Changelog
lavdev: add libavfilter virtual input device
2011-08-11 17:20:17 +02:00
cmdutils_common_opts.h
Make all option parsing functions match the function pointer type through which they are called.
2011-06-30 11:49:48 -04:00
cmdutils.c
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
2011-08-13 02:56:08 +02:00
cmdutils.h
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
2011-08-13 02:56:08 +02:00
common.mak
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
configure
configure: fix datadir after avconv merge
2011-08-15 22:36:13 +02: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 'qatar/master'
2011-07-14 20:44:58 +02:00
ffmpeg.c
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
ffplay.c
Merge remote-tracking branch 'qatar/master'
2011-08-15 23:35:53 +02:00
ffprobe.c
NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'
2011-08-10 16:29:20 +02:00
ffserver.c
Rename ffserver to avserver.
2011-08-09 19:56:25 +02:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
LICENSE
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
MAINTAINERS
MAINTAINERS: add a "Releases" section
2011-06-24 11:15:26 +02:00
Makefile
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
2011-08-13 02:56:08 +02:00
README
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
RELEASE
set Release to 0.8.2.git. We are at 0.8.2 and a bit further.
2011-08-13 03:39:58 +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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%