1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 9a714d871a Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
  asfdec: support reading ID3v2 tags in ASF files

Conflicts:
	Changelog
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10 13:06:16 +01:00
compat
doc lavfi: remove mp=il filter 2013-02-09 21:43:39 +00:00
libavcodec Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2' 2013-02-10 12:14:14 +01:00
libavdevice lavd/alsa: simplify reordering functions definition. 2013-02-02 14:13:11 +01:00
libavfilter lavfi/il: fix typo in Copyright 2013-02-09 21:56:04 +00:00
libavformat Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419' 2013-02-10 13:06:16 +01:00
libavresample
libavutil Call the common 7.1 wide channel layout "7.1(wide)". 2013-02-09 18:14:46 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: Dont use floats for S32->S32 when possible 2013-02-04 04:11:46 +01:00
libswscale sws: dont write out of array on bigendian 2013-02-07 16:22:51 +01:00
presets
tests vc1dec: Fix destination pointers in context for fields 2013-02-08 00:10:29 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419' 2013-02-10 13:06:16 +01:00
cmdutils_common_opts.h
cmdutils.c Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d' 2013-02-06 15:57:45 +01:00
cmdutils.h
common.mak
configure Merge commit '79dad2a932534d1155079f937649e099f9e5cc27' 2013-02-07 13:09:35 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 01:26:26 +01:00
ffmpeg.c ffmpeg: do not call exit from exit_program() 2013-02-06 04:03:52 +01:00
ffmpeg.h
ffplay.c Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de' 2013-02-10 12:47:37 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak build: Remove superfluous MAKE variable for the build suffix 2013-02-03 13:08:36 +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.