1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer df5e089da9 Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
  lavf: split wav muxer and demuxer into separate files.

Conflicts:
	libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 15:46:08 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
doc examples/muxing: fix video pts 2012-10-17 02:40:00 +02:00
libavcodec Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 2012-10-17 14:17:55 +02:00
libavdevice caca: fix 10l typo 2012-10-12 19:05:58 +02:00
libavfilter lavfi: limit matching w/h/fmt asserts to non scale filters 2012-10-17 00:06:12 +02:00
libavformat Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1' 2012-10-17 15:46:08 +02:00
libavresample Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
libavutil Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swr-test: fix division by 0 2012-10-16 19:40:57 +02:00
libswscale sws-test: parse command line args before initing contexts 2012-10-17 11:56:36 +02:00
presets
tests Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56' 2012-10-17 15:16:23 +02:00
tools tools/ffeval: do not use UNIX-specific /dev/std{in,out} files 2012-10-16 13:51:44 +02:00
.gitignore gitignore: add *.dylib for those of us on Darwin/OS X systems. 2012-10-16 04:14:09 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
Changelog Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56' 2012-10-17 15:16:23 +02:00
cmdutils_common_opts.h
cmdutils.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
cmdutils.h
common.mak
configure Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams 2012-10-16 01:04:42 +02:00
ffmpeg_opt.c Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 2012-10-17 14:30:25 +02:00
ffmpeg.c ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +02:00
ffmpeg.h ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +02:00
ffplay.c ffplay: Prevent 0/0 aspect from being passed on to lavfi 2012-10-14 23:40:14 +02:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 2012-10-17 14:17:55 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
LICENSE
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-16 14:15:16 +02:00
README
RELEASE prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
version.sh

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.