MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,350 Commits 4 Branches 0 Tags 195 MiB
C 90.5%
Assembly 7.6%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
08196c785a
Go to file
Michael Niedermayer 08196c785a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: suppress -fPIC in msvc builds
  Drop unnecessary 'l' length modifier when printfing double values.
  truemotion2: Sanitize tm2_read_header()

Conflicts:
	libavcodec/truemotion2.c
	libavfilter/src_movie.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 14:20:01 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-12-31 14:20:01 +01:00
libavdevice Merge back some registering macros in all*.c. 2012-12-30 07:18:21 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-12-31 14:20:01 +01:00
libavformat Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
libavresample Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
libavutil Drop unnecessary 'l' length modifier when printfing double values. 2012-12-31 11:20:45 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample docs: add soxr documentation 2012-12-27 12:13:17 +01:00
libswscale sws: fix warning: cast from pointer to integer of different size 2012-12-29 20:50:43 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01' 2012-12-31 13:53:21 +01:00
tools Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
cmdutils.h Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-12-31 14:20:01 +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 ffmpeg: use the new swr -async parameter instead of a set of parameters. 2012-12-25 17:22:14 +01:00
ffmpeg_opt.c ffmpeg_opt: fix recording time in->out carryover. 2012-12-20 17:45:43 +01:00
ffmpeg.c ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate 2012-12-27 15:47:15 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +01:00
ffplay.c ffplay: fix type of time_diff in waveform display 2012-12-28 20:01:01 +01:00
ffprobe.c ffprobe: show pkt_size in frame 2012-12-15 11:46:47 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +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-12-11 08:24:45 +01:00
LICENSE lavfi: add pp filter. 2012-12-23 19:03:36 +01:00
MAINTAINERS MAINTAINERS: s/mjpeg.c/mjpeg*.c/ 2012-12-28 13:04:44 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +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.