1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer afe30fe060 Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'
* commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f':
  mace: decode directly to the user-provided AVFrame
  libspeex: decode directly to the user-provided AVFrame
  libopus: decode directly to the user-provided AVFrame
  libopencore-amr: decode directly to the user-provided AVFrame
  libgsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/libopusdec.c
	libavcodec/mace.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-13 12:14:46 +01:00
compat
doc doc/demuxers: quote command line arguments with @code 2013-02-13 04:13:55 +01:00
libavcodec Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f' 2013-02-13 12:14:46 +01:00
libavdevice lavd/v4l2: fix error logic when enumerating standards 2013-02-10 20:59:06 +01:00
libavfilter lavfi/amerge: make description consistent with documentation 2013-02-11 14:43:23 +00:00
libavformat WAV muxer: add RF64 support 2013-02-12 14:50:27 +00:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-02-12 14:10:36 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample
libswscale swscale: Disallow conversion to GBRP16 2013-02-11 20:03:16 +02:00
presets
tests swscale: Disallow conversion to GBRP16 2013-02-11 20:03:16 +02:00
tools
.gitignore
arch.mak
Changelog WAV muxer: add RF64 support 2013-02-12 14:50:27 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4' 2013-02-12 13:41:24 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: fix streamcopy of lsf mp3. 2013-02-12 00:38:22 +01:00
ffmpeg.h
ffplay.c Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'" 2013-02-10 14:27:57 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b' 2013-02-12 13:26:22 +01:00
LICENSE
MAINTAINERS
Makefile
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.