generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,830 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%
abf91f7fee
Go to file
Michael Niedermayer abf91f7fee Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e' 
* commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e':
  cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
  h264: Fix parameters to ff_er_add_slice() call
  h264: always check ref_count for validity

Conflicts:
	libavcodec/h264.c
	libavutil/cpu.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 12:58:00 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc doc/filters: fix a few typos in the frei0r docs 2012-11-16 16:52:14 +01:00
libavcodec xxan: check ybuf index before use. 2012-11-17 04:45:56 +01:00
libavdevice dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions 2012-11-16 19:26:13 +01:00
libavfilter lavfi/geq: fix GPL license header. 2012-11-15 21:48:39 +01:00
libavformat lavf/avienc: return proper error codes, and provide some more feedback 2012-11-17 11:15:00 +01:00
libavresample Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
libavutil Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e' 2012-11-17 12:58:00 +01:00
libpostproc pp: simplify postProcess(). 2012-11-16 23:13:36 +01:00
libswresample swr/resample: fix SSSE3 included unconditionally. 2012-11-15 23:52:44 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-11-14 12:34:30 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests mxfdec: set audio packets pts 2012-11-16 14:12:37 +01:00
tools Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.gitignore .gitignore: ignore *.3 files as well 2012-11-06 12:24:12 +01:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd' 2012-11-16 13:07:10 +01:00
cmdutils_common_opts.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
cmdutils.c cmdutils: free the report file name. 2012-11-17 12:41:22 +01:00
cmdutils.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
common.mak Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
configure configure: add --fatal-warnings option. 2012-11-17 12:01:17 +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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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
ffmpeg_filter.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
ffmpeg_opt.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
ffmpeg.c ffmpeg: fix double ;; 2012-11-14 02:06:50 +01:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffplay.c ffplay: adjust external clock speed based on buffer fullness for realtime sources 2012-11-04 18:29:49 +01:00
ffprobe.c ffprobe: fix potential NULL pointer dereference 2012-11-06 22:59:24 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-11-16 13:23:35 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-11-03 14:48:51 +01:00
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: fix entry for img2 2012-11-06 01:46:21 +01:00
Makefile x86: yasm: Use complete source path for macro helper %includes 2012-10-31 00:37:42 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +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 in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.