RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-23 15:53:08 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
45,382 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
13afee951a
Go to file
Michael Niedermayer 13afee951a Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 
* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
  lavfi: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/filtfmts.c
	libavfilter/vf_ass.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 17:04:58 +02:00
compat
doc Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
libavcodec Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5' 2012-10-12 16:48:26 +02:00
libavdevice
libavfilter Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
libavformat yop: check return value of avformat_new_stream() 2012-10-12 14:25:00 +00:00
libavresample
libavutil Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
libpostproc
libswresample swri_resample_init: unsupported sample formats are an internal error. 2012-10-11 04:36:23 +02:00
libswscale Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc' 2012-10-12 15:57:28 +02:00
presets
tests Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
tools Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
.gitignore
arch.mak
Changelog prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
cmdutils_common_opts.h
cmdutils.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
cmdutils.h
common.mak
configure Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c
ffmpeg_opt.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
ffmpeg.c Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffmpeg.h Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffplay.c
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
LICENSE
MAINTAINERS
Makefile
README
RELEASE prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
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.