generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,071 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
bb9d5171a7
Go to file
Michael Niedermayer bb9d5171a7 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  swscale: Add Doxygen for hyscale_fast/hScale.
  fate: enable lavfi-pixmt tests on big endian systems
  PPC: swscale: disable altivec functions for unsupported formats
  fate: merge identical pixdesc_be/le tests
  swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
  build: call texi2pod.pl with full path instead of symlink
  build: include sub-makefiles using full path instead of symlinks
  swscale: update big endian reference values after dff5a835.
  wavpack: skip blocks with no samples
  cosmetics: remove outdated comment that is no longer true
  build: replace some addprefix/addsuffix with substitution refs
  avutil: Remove unused arbitrary precision integer code.
  configure: Drop check for availability of ten assembler operands.
  aacenc: Save channel configuration for later use.
  aacenc: Fix codebook trellising for zeroed bands.
  swscale: change prototypes of scaled YUV output functions.
  swscale: re-add support for non-native endianness.
  swscale: disentangle yuv2rgbX_c_full() into small functions.
  swscale: split yuv2packed[12X]_c() remainders into small functions.
  swscale: split yuv2packedX_altivec in smaller functions.
  ...

Conflicts:
	Makefile
	configure
	libavcodec/x86/dsputil_mmx.c
	libavfilter/Makefile
	libavformat/Makefile
	libavutil/integer.c
	libavutil/integer.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-29 05:23:12 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +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-06-29 05:23:12 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +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-06-29 05:23:12 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +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 cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c parse_options(): Avoid passing NULL as a string arg to fprintf 2011-06-24 13:04:51 -04:00
cmdutils.h lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +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 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2. 2011-06-26 14:09:48 -07:00
ffplay.c ffplay: use new avformat_open_* API. 2011-06-22 20:08:45 +02:00
ffprobe.c ffprobe: remove duplicate avformat_alloc_context() 2011-06-21 14:38:58 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00: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-06-29 05:23:12 +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.