No description
Find a file
Michael Niedermayer b4d4e51027 Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'
* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
	configure
	libavformat/riff.c
	libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-27 14:10:05 +01:00
compat
doc AFC demuxer 2012-11-27 10:17:28 +00:00
libavcodec Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b' 2012-11-27 13:39:52 +01:00
libavdevice
libavfilter lavfi/overlay: enable yuva420p as overlay background 2012-11-27 10:44:42 +01:00
libavformat Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 2012-11-27 14:10:05 +01:00
libavresample
libavutil Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 2012-11-27 14:10:05 +01:00
libpostproc
libswresample
libswscale
presets
tests Add an annotation field as required by the specification when muxing Sun AU. 2012-11-24 10:43:11 +01:00
tools
.gitignore
arch.mak
Changelog ADPCM IMA Dialogic decoder 2012-11-24 10:56:47 +00:00
cmdutils.c replace av_log(0, by av_log(NULL, 2012-11-23 18:10:02 +01:00
cmdutils.h
cmdutils_common_opts.h
common.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
configure Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' 2012-11-27 14:10:05 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c ffmpeg: fix mixed declarations and statements. 2012-11-24 03:02:11 +01:00
ffmpeg.h ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg_filter.c ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffmpeg_opt.c ffmpeg: fix swr filter_type for auto inserted aresample filters 2012-11-26 04:06:19 +01:00
ffplay.c
ffprobe.c ffprobe: free dictionary in opt_show_entries() 2012-11-23 18:49:26 +01:00
ffserver.c
INSTALL
library.mak Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01:00
LICENSE
MAINTAINERS
Makefile Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 2012-11-23 13:30:51 +01: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.