1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
Michael Niedermayer 4cdc337b5d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  flvenc: silence bogus warning
  configure: include flags in nm variable
  alsdec: fix misplaced parentheses.
  alsdec: check return values.
  alsdec: fix number of decoded samples in first sub-block in BGMC mode.
  alsdec: Fix out of ltp_gain_values read.
  alsdec: Check that quantized parcor coeffs are within range.
  alsdec: check opt_order.

Conflicts:
	configure
	libavcodec/alsdec.c
	libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-18 15:06:43 +02:00
compat compat/vsnprintf: return number of bytes required on truncation. 2012-09-15 19:46:54 -04:00
doc doc: fix typos in filter documentation 2012-09-18 09:06:44 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-09-18 15:06:43 +02:00
libavdevice lavd/lavfi: apply stylistic fixes to the options help fields 2012-09-11 22:56:35 +02:00
libavfilter Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
libavformat flvenc: silence bogus warning 2012-09-18 10:31:04 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil fate: add av_small_strptime() test to fate-parseutils 2012-09-17 12:46:55 +02:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample swr/resample: mark mm_flags as potentially unused 2012-09-13 19:31:02 +02:00
libswscale swscale: change assert() to av_assert() 2012-09-18 05:19:11 +02:00
presets
tests fate: add av_small_strptime() test to fate-parseutils 2012-09-17 12:46:55 +02:00
tools Remove mt-work directory 2012-09-15 15:40:36 -04:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak
Changelog Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
cmdutils_common_opts.h
cmdutils.c msvc: Add a va_copy compatability macro for msvc 2012-09-15 19:46:48 -04:00
cmdutils.h
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-09-18 15:06:43 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
ffmpeg_opt.c
ffmpeg.c ffmpeg: use PTS from the AVSubtitle structure for sub2video. 2012-09-15 16:14:33 +02:00
ffmpeg.h ffmpeg: use PTS from the AVSubtitle structure. 2012-09-15 16:14:33 +02:00
ffplay.c ffplay: dont wait 100ms if data is not yet ready 2012-09-16 19:07:28 +02:00
ffprobe.c ffprobe: kill initializers with nested union field definition 2012-09-14 10:47:08 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-09-12 11:46:47 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +02:00
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.