1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer b4780d03d0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
  rational: add av_inv_q() returning the inverse of an AVRational
  dpx: Make start offset unsigned
  lavfi: properly signal out-of-memory error in ff_filter_samples
  cosmetics: Fix a few switched periods and linebreaks
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-05 22:17:02 +02:00
compat
doc libtwolame MP2 encoding support 2012-08-05 17:06:59 +00:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
libavdevice
libavfilter Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
libavformat oggdec: Initialize stream index to -1 in ogg_packet. 2012-08-05 19:47:52 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
mt-work
presets
tests fate: add bitexact flag to fate-sub-movtextenc 2012-08-05 17:59:12 +02:00
tools
.gitignore
arch.mak
Changelog libtwolame MP2 encoding support 2012-08-05 17:06:59 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure libtwolame MP2 encoding support 2012-08-05 17:06:59 +00: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.c Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE LICENSE: Document all GPL files 2012-08-04 04:03:08 +02:00
MAINTAINERS
Makefile
README
RELEASE
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.