FFmpeg git repo
Go to file
Michael Niedermayer 7876f14f8b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pthread: add some malloc failure checks
  avconv: cosmetics, reformat transcode_init()
  avconv: rename 'os' variable to 'oc'
  doc/filters: fix some typos.
  configure: add libpulse to help output

Conflicts:
	avconv.c
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 02:54:50 +01:00
doc Document a critical gotcha in FATE 2011-11-21 23:52:23 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-22 02:54:50 +01:00
libavdevice Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
libavfilter Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
libavformat [PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder 2011-11-21 23:06:53 +01:00
libavutil Fix compilation with YASM. 2011-11-20 15:03:32 +01:00
libpostproc postproc: remove stray + 2011-10-30 18:11:09 +01:00
libswresample swr: change minimum I/O channel count to zero. 2011-11-20 16:06:16 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-11-20 02:46:06 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-10-29 02:08:54 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog [PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder 2011-11-21 23:06:53 +01:00
Doxyfile
INSTALL
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: add myself as a web site maintainer 2011-11-21 00:07:52 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README
RELEASE RELEASE: bump to 0.8.6.git after the release 2011-11-12 21:00:13 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-11-22 02:54:50 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-11-01 02:02:20 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-11-01 02:02:20 +01: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 Merge remote-tracking branch 'qatar/master' 2011-11-22 02:54:50 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-11-22 02:54:50 +01:00
ffplay.c ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file. 2011-11-21 20:20:48 +01:00
ffprobe.c ffprobe: make writer_print_integer support long long int values 2011-11-18 10:09:26 +01:00
ffserver.c ffserver: use av_noreturn 2011-11-11 04:25:53 +01:00
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.