No description
Find a file
Michael Niedermayer 2b0cdb7364 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Move id3v2 tag writing to a separate file.
  swscale: add missing colons to x86 assembly yuv2planeX.
  g722: split decoder and encoder into separate files
  cosmetics: remove extra spaces before end-of-statement semi-colons
  vorbisdec: check output buffer size before writing output
  wavpack: calculate bpp using av_get_bytes_per_sample()
  ac3enc: Set max value for mode options correctly
  lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
  mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
  mpeg12: move full_pel from MpegEncContext to Mpeg1Context
  mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
  mpegvideo: remove some unused variables from MpegEncContext.

Conflicts:
	libavcodec/mpeg12.c
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24 01:01:21 +02:00
doc deshake: add documentation in filters.texi 2011-10-21 10:02:35 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
libavdevice pulse: fix application name 2011-10-22 02:11:50 +02:00
libavfilter vsrc_testsrc: do not assume non-padded lines in test_fill_picture() 2011-10-23 23:54:37 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
libavutil Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type 2011-10-21 00:36:00 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2011-10-13 18:04:02 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
Changelog Merge remote-tracking branch 'luzero/pulse' 2011-10-22 01:56:57 +02:00
cmdutils.c cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.h cmdutils.h: Project name cleanup 2011-10-14 02:18:55 +02:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
common.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
configure Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
ffprobe.c ffprobe: prefer av_freep() over av_free() for global print_format option. 2011-10-18 19:11:05 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +02:00
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +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.

2) Licensing
------------

* See the LICENSE file.