videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-16 11:54:09 +02:00
Code Releases Activity
48,878 Commits 36 Branches 398 Tags 246 MiB
C 90.2%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
57d59e82cb
Go to file
Michael Niedermayer 57d59e82cb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmpproto: Fix assignments in if()
  lavf: Fix assignments in if()
  svq1enc: Fix assignments in if()
  lavc: Fix assignments in if() when calling ff_af_queue_add
  h264: Fix assignments in if()
  truemotion2: cosmetics, reformat

Conflicts:
	libavcodec/svq1enc.c
	libavcodec/truemotion2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 15:53:25 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec' 2013-01-14 13:29:00 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-01-14 15:53:25 +01:00
libavdevice Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1' 2013-01-14 14:16:21 +01:00
libavfilter Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de' 2013-01-14 14:43:32 +01:00
libavformat rtmpproto: Fix assignments in if() 2013-01-14 13:13:00 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-09 12:30:14 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-01-12 13:42:42 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample swr/dither: fix division by 0 2013-01-14 02:57:00 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2013-01-05 13:37:30 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8' 2013-01-13 13:54:52 +01:00
tools Fix "knwon" typo and add a check in tools/patcheck 2013-01-04 19:24:37 +00:00
.gitignore Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec' 2013-01-14 13:29:00 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c cmdutils: update copyright year to 2013 2013-01-03 13:35:12 +02: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 '246da0b13551b1f80f067e4f258e5bd691f5ab33' 2013-01-14 14:00:21 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
ffmpeg_filter.c ffmpeg: sub2video: set resample size. 2013-01-01 23:06:34 +01:00
ffmpeg_opt.c doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases 2013-01-13 15:09:09 +01:00
ffmpeg.c add note on windows pipe 2013-01-06 17:47:49 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +01:00
ffplay.c ffplay: fix sws_flags 2013-01-13 22:48:28 +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 Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
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 README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.