No description
Find a file
Michael Niedermayer 104f42e694 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc/APIchanges: add an entry for codec descriptors.
  vorbisenc: set AVCodecContext.bit_rate to 0
  vorbisenc: fix quality parameter
  FATE: add ALAC encoding tests
  lpc: fix alignment of windowed samples for odd maximum LPC order
  alacenc: use s16p sample format as input
  alacenc: remove unneeded sample_fmt check
  alacenc: fix max_frame_size calculation for the final frame
  adpcm_swf: Use correct sample offsets when using trellis.
  rtmp: support strict rtmp servers
  mjpegdec: support AVRn interlaced
  x86: remove FASTDIV inline asm

Conflicts:
	doc/APIchanges
	libavcodec/mjpegdec.c
	libavcodec/vorbisenc.c
	libavutil/x86/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 14:33:33 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
libavdevice dshow:protect access to curbufsize to promote consistency 2012-08-20 20:58:05 +02:00
libavfilter lavfi: free partial audio buffers when destroying links. 2012-08-22 23:31:49 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libavutil x86: remove FASTDIV inline asm 2012-08-22 14:29:10 +01:00
libpostproc rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
libswscale rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
mt-work Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog lavfi: add showspectrum filter. 2012-08-20 23:03:06 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
cmdutils_common_opts.h Merge commit 'f8b1e66553' 2012-08-20 17:06:50 +02:00
common.mak checkheaders: Rename HEADEROBJS to HOBJS 2012-08-09 05:02:45 +02:00
configure huffman/huffyuv: move lorens huffman table generation code to huffman.c/h 2012-08-22 16:52:07 +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.c ffmpeg: use close_output_stream more systematically. 2012-08-22 19:04:30 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
ffmpeg_filter.c ffmpeg: make decoding_needed a counter. 2012-08-22 19:04:30 +02:00
ffmpeg_opt.c ffmpeg: remove outdated warning. 2012-08-21 00:03:00 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS Canopus Lossless decoder 2012-08-01 22:02:19 -04:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +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.