RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
40,869 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
040a796dab
Go to file
Michael Niedermayer 040a796dab Merge commit '755cd4197d53946208e042f095b930dca18d9430' 
* commit '755cd4197d53946208e042f095b930dca18d9430':
  mov: enable parsing for VC-1.
  lavfi: Add fps filter.
  lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
  avconv: add support for audio in complex filtergraphs.

Conflicts:
	ffmpeg.c
	libavfilter/version.h
	libavformat/mov.c
	tests/ref/fate/vc1-ism

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-19 20:31:24 +02:00
doc Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
libavcodec Use a variable instead of a repeated calculation when decoding AVUI. 2012-05-19 20:07:28 +02:00
libavdevice lavd/dshow: fix make checkheaders. 2012-05-18 23:34:11 +02:00
libavfilter Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
libavformat Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
libavutil lavu/error: fix make checkheaders. 2012-05-18 23:34:11 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr: add swr_next_pts() 2012-05-19 19:23:37 +02:00
libswscale Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-05-19 00:52:25 +02:00
tools lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure configure: check for pthread_cancel. 2012-05-14 19:32:43 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
ffplay.c ffplay: put aspect ratio info to the VideoPicture struct 2012-05-15 00:31:56 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-05-17 23:45:00 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS JACOsub demuxer, decoder and muxer. 2012-05-03 19:37:14 +02:00
Makefile doc/examples: install them with the shared data. 2012-05-19 12:28:59 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.