ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 07:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,181 Commits 36 Branches 398 Tags 546 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
4362f272c0
Go to file
Michael Niedermayer 4362f272c0 Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db' 
* commit '4a4841d4e0f0dc50998511bf6c48b518012024db':
  fraps: use the AVFrame API properly.
  rpza: use the AVFrame API properly.
  motionpixels: use the AVFrame API properly.
  vmdvideo: use the AVFrame API properly.

Conflicts:
	libavcodec/fraps.c
	libavcodec/motionpixels.c
	libavcodec/rpza.c
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 02:24:27 +01:00
compat
doc Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
libavcodec Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db' 2013-11-17 02:24:27 +01:00
libavdevice lavd/xv: free resources on errors 2013-11-15 09:56:58 +01:00
libavfilter Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
libavformat Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
libavresample
libavutil Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' 2013-11-14 15:04:04 +01:00
libpostproc
libswresample
libswscale swscale/swscale_unscaled: fix right column handling in planarCopyWrapper 2013-11-16 21:15:05 +01:00
presets
tests Merge commit '952f943d40e9dbcd68bc851460cc99268091a294' 2013-11-17 01:22:35 +01:00
tools
.gitignore
arch.mak
Changelog lavc: VP9 decoder 2013-11-15 10:16:28 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure lavc: VP9 decoder 2013-11-15 10:16:28 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-16 14:27:29 +01:00
ffmpeg.c Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
ffmpeg.h ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-16 14:27:29 +01:00
ffplay.c Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

README 

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.