1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer eec9c7af33 Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
* commit 'fee9db1fdf921295233e94cbe2769f9cd722206d':
  libavcodec: use avpriv_open()

Conflicts:
	libavcodec/libxvid_rc.c

The changed code does not exist in ffmpeg anymore, thus nothing is
changed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08 11:35:52 +02:00
compat
doc Merge commit '605387582bd35920b83a26dabbe1c0601f425621' 2013-08-06 15:33:12 +02:00
libavcodec Merge commit '22c879057ead189c0f59241cb9eeb926381e3299' 2013-08-08 10:49:23 +02:00
libavdevice
libavfilter Merge commit '3799376dd3373ee255651ed542c75b15665801a8' 2013-08-06 09:35:03 +02:00
libavformat Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1' 2013-08-08 10:41:32 +02:00
libavresample
libavutil Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21' 2013-08-08 11:18:17 +02:00
libpostproc
libswresample
libswscale swscale/utils: Fix potential overflow of srcPos*C before converting to 64bit 2013-08-08 02:56:26 +02:00
presets
tests ffmpeg: remove obsolete workaround in trim insertion. 2013-08-07 16:20:41 +02:00
tools Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc' 2013-08-06 14:50:27 +02:00
.gitignore
arch.mak
Changelog Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: Add -lstdc++ to the requirements for linking with libgme. 2013-08-07 11:13:40 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: remove obsolete workaround in trim insertion. 2013-08-07 16:20:41 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c
ffprobe.c
ffserver.c Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 2013-08-06 09:13:51 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: alphabetical sort 2013-08-07 03:01:51 +02:00
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.