FFmpeg git repo
Go to file
Michael Niedermayer 3c54e7ed4f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
  ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
  ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
  wavpack: fix wrong return value in wavpack_decode_block()
  avconv: fix parsing metadata specifiers.
  fate: use +frame+slice named constants instead of '3'
  mpeg12: propagate more real return values through chunk decode error return and fix some indentation
  wavpack: use context reset in appropriate places
  avconv: move mux_preload and mux_max_delay to options context
  avconv: move bitstream filters to options context.
  avconv: move rate_emu to options context.
  avconv: move max_frames to options context.
  avconv: move metadata to options context.
  avconv: move ts scale to options context.
  avconv: move chapter maps to options context.
  avconv: move metadata maps to options context.
  avconv: move codec_names to options context.

Conflicts:
	avconv.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-05 22:29:16 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
libavdevice openal-dec: fix missing list_devices unit for list_devices AVOption 2011-09-02 05:28:31 +02:00
libavfilter vf_drawtext: make strftime work without localtime_r() 2011-09-05 05:16:44 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
libavutil av_string: add av_asprintf(). 2011-09-04 09:37:41 +02:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-08-26 20:28:54 +02:00
libswscale swscale: Fix unused asm and enable it 2011-09-05 18:42:44 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
tools Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
.gitignore lavc: add a table of all codecs names. 2011-08-22 10:54:44 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
Changelog lavfi: add amovie source - audio movie source 2011-08-27 12:46:55 +02:00
cmdutils_common_opts.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure ffmpeg: fix reading from stdin on windows 2011-09-04 02:14:39 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-09-05 22:29:16 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Makefile: remove unused PROGS_G. 2011-09-01 20:23:40 +02:00
README
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +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.