1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 7e5496fc41 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: use numeric ID for Tag_ABI_align_preserved
  segment: Pass the interrupt callback on to the chained AVFormatContext, too
  ARM: bswap: drop armcc version of av_bswap16()
  ARM: set Tag_ABI_align_preserved in all asm files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-03 13:35:02 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
libavfilter lavfi/transpose: add passthrough option 2012-10-02 09:43:06 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample swresample: Create version.h header 2012-09-28 15:10:36 +02:00
libswscale sws: drop unused variable 2012-09-30 23:14:20 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests 8svx: Fixing header size, move decoding to per call instead of the first call. 2012-10-03 03:49:24 +02: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 Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02: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-02 19:48:54 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
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 Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +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 Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
ffprobe.c fix exit_program() prototypes 2012-10-02 21:55:31 +02:00
ffserver.c ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier. 2012-10-02 22:59:03 +02:00
INSTALL
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
RELEASE RELEASE: update for 1.0 2012-09-27 01:48:14 +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.