virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
49,355 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
5cb0782b95
Go to file
Michael Niedermayer 5cb0782b95 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo_enc: fix indentation in load_input_picture()

Conflicts:
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26 15:53:58 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc doc/texi2pod: fix warnings introduced in e7e14bc69a 2013-01-26 15:12:57 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-01-26 15:53:58 +01:00
libavdevice Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libavfilter lavfi/vf_drawtext: default to expansion=normal. 2013-01-26 12:52:19 +01:00
libavformat lavf/gifdec: cosmetics: remove extra whitespace 2013-01-26 09:28:57 +00:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil Merge commit '38c1466ca41c73c7ce347da702362cb69c151716' 2013-01-26 13:34:30 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample swr: support first_pts 2013-01-21 00:52:14 +01:00
libswscale sws: GBRP9, GBRP10 GBRP12 GBRP14 output support 2013-01-26 06:11:52 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45' 2013-01-26 14:33:06 +01:00
tools Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog remove av_strnstr from Changelog 2013-01-26 14:04:30 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c cmdline: fix -- to escape files starting with - 2013-01-19 14:50:36 +01:00
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339' 2013-01-25 14:14:21 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00
ffmpeg_opt.c ffmpeg: add -guess_layout_max option. 2013-01-26 11:15:38 +01:00
ffmpeg.c ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00
ffmpeg.h ffmpeg: add -guess_layout_max option. 2013-01-26 11:15:38 +01:00
ffplay.c ffplay: flush video filters on seek 2013-01-19 00:48:06 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.