FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer 3fa72de82f Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8':
  avconv: distinguish between -ss 0 and -ss not being used

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-08-06 10:25:32 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2013-07-19 11:08:38 +02:00

doc

mpegts: add fix_teletext_pts mpegts demuxer option

2013-08-06 02:47:38 +02:00

libavcodec

Set bits_per_raw_sample when decoding pnm.

2013-08-06 00:26:21 +02:00

libavdevice

avdevice/vfwcap: make constant arrays static

2013-08-03 22:24:31 +02:00

libavfilter

Merge commit '3799376dd3373ee255651ed542c75b15665801a8'

2013-08-06 09:35:03 +02:00

libavformat

mpegts: add fix_teletext_pts mpegts demuxer option

2013-08-06 02:47:38 +02:00

libavresample

Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

2013-08-03 09:16:36 +02:00

libavutil

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

2013-08-03 10:08:30 +02:00

libpostproc

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

2013-06-16 18:21:39 +02:00

libswresample

swresample: fix negative rematrix volumns

2013-07-22 03:24:22 +02:00

libswscale

Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

2013-08-03 09:16:36 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

fate: Add vorbiscomment cover art test

2013-08-05 10:48:37 +02:00

tools

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

2013-07-07 11:35:59 +02:00

.gitignore

Rename ffadler to ffhash and expand it using the generic hash API

2013-05-16 17:58:56 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

2013-08-03 09:01:48 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

cmdutils: replace exit() by exit_program()

2013-07-08 11:12:32 +02:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

common.mak

Integrate lcov/gcov into Libav

2013-04-05 18:55:11 +02:00

configure

configure: Check for GCC diagnostic pragma support inside of functions

2013-08-03 10:08:04 +02:00

COPYING.GPLv2

…

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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

2013-08-06 10:25:32 +02:00

ffmpeg_opt.c

Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

2013-08-06 10:25:32 +02:00

ffmpeg.c

Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

2013-08-06 10:25:32 +02:00

ffmpeg.h

ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

2013-05-08 23:55:06 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2013-07-26 11:12:11 +02:00

ffprobe.c

ffprobe: add -show_programs option

2013-07-28 16:39:06 +02:00

ffserver.c

Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

2013-08-06 09:13:51 +02:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

lavfi: port perspective filter from libmpcodecs

2013-07-14 16:27:17 +00:00

MAINTAINERS

MAINTAINERS: order libavutil entries alphabetically

2013-08-04 11:24:57 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Update for 2.0

2013-07-10 02:15:43 +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.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%