1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer ae77266fce Merge commit '78071a1420b425dfb787ac739048f523007b8139'
* commit '78071a1420b425dfb787ac739048f523007b8139':
  pixfmt: add AV_ prefixes to PIX_FMT_*

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 19:42:49 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc Merge commit '78071a1420b425dfb787ac739048f523007b8139' 2012-10-08 19:42:49 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-10-08 13:11:11 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-10-08 13:11:11 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-10-08 13:11:11 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-10-08 13:11:11 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil Merge commit '78071a1420b425dfb787ac739048f523007b8139' 2012-10-08 19:42:49 +02:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample swr-test: avoid VLA 2012-10-06 13:48:47 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
tools Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
ffmpeg_opt.c ffserver: fix seeking with ?date=... 2012-10-08 09:03:19 +02:00
ffmpeg.c fix exit_program() prototypes 2012-10-02 21:55:31 +02:00
ffmpeg.h ffmpeg: add option to control copying of frames prior to start. 2012-09-27 03:52:31 +02:00
ffplay.c ffplay: autodetect realtime streams and enable infbuf 2012-10-04 17:35:20 +02:00
ffprobe.c ffprobe: reindent after previous commit 2012-10-05 23:58:23 +02:00
ffserver.c ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier. 2012-10-02 22:59:03 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit '581281e242609a222233a2e5538b89dfb88fb18e' 2012-09-20 03:20:29 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS MAINTAINERS: add 1.0 2012-09-27 01:48:14 +02:00
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update for 1.0 2012-09-27 01:48:14 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.