RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 04:54:55 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
31,119 Commits 37 Branches 400 Tags 240 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
721be99371
Go to file
Michael Niedermayer 721be99371 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: fix some then/than typos
  doxygen: Include libavcodec and libavformat examples into the documentation
  avutil: elaborate documentation for av_get_random_seed
  Add support for aac streams in mp4/mov without extradata.
  aes: whitespace cosmetics
  adler32: whitespace cosmetics
  swscale: fix another yuv range conversion overflow in 16bit scaling.
  Fix cpu flags test program
  opt-test: Add missing braces to silence compiler warnings.
  build: Eliminate obsolete test targets.
  udp: Fix a compilation warning
  swscale: Unbreak build with --enable-small
  base64: add fate test
  aes: improve test program and add fate test
  adler32: make test program more useful and add fate test
  swscale: fix yuv range correction when using 16-bit scaling.
  aacenc: Make chan_map const correct

Conflicts:
	Makefile
	doc/examples/muxing-example.c
	libavformat/udp.c
	libavutil/random_seed.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-01 05:35:26 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog lavdev: add openal input device 2011-06-27 15:26:14 +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 Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
cmdutils.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +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-01 05:35:26 +02:00
ffmpeg.c Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
ffplay.c Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
ffprobe.c Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
ffserver.c Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
ffserver.h multiple inclusion guard cleanup 2011-05-21 13:48:10 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Use the contents of RELEASE as version fallback instead of 'UNKNOWN' 2011-06-19 19:54:07 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.