1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 67a580f423 Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
  lavc: Add refcounted api to AVPacket

Conflicts:
	libavcodec/avpacket.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 10:45:13 +02:00
compat
doc Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d' 2013-08-11 10:45:13 +02:00
libavcodec Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d' 2013-08-11 10:45:13 +02:00
libavdevice lavd: Fix make checkheaders 2013-08-11 00:40:30 +02:00
libavfilter avfilter/f_sendcmd: make const arrays static const 2013-08-10 18:44:39 +02:00
libavformat avformat/tedcaptionsdec: make const arrays static const 2013-08-10 18:44:40 +02:00
libavresample
libavutil lavu: fix grammar in doxy for av_frame_ref. 2013-08-11 00:40:48 +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 tests/fli: avoid rounding errors in -t option. 2013-08-10 20:17:10 +02:00
tools Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc' 2013-08-06 14:50:27 +02:00
.gitignore
arch.mak
Changelog Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 2013-08-08 12:11:33 +02:00
cmdutils_common_opts.h
cmdutils.c Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520' 2013-08-08 11:54:14 +02:00
cmdutils.h
common.mak
configure Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 2013-08-08 12:11:33 +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 ffplay: check for filter EOF return codes 2013-08-09 00:16:13 +02:00
ffprobe.c
ffserver.c Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 2013-08-06 09:13:51 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add Alexander Strasser for the server 2013-08-09 00:03:43 +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.