FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer b6e7041f90 Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
  doc: improve documentation for the asyncts filter first_pts option
  asyncts: fix the asyncts behavior when using the first_pts option

Conflicts:
	libavfilter/af_asyncts.c

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

2012-12-14 13:58:12 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

2012-12-14 13:58:12 +01:00

libavcodec

Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'

2012-12-14 13:51:20 +01:00

libavdevice

dshow: fix return code when opening device

2012-12-08 21:44:30 +01:00

libavfilter

Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

2012-12-14 13:58:12 +01:00

libavformat

sauce: test filetype correctly for datatype 5 (binary text)

2012-12-14 16:46:29 +11:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-12-12 10:50:21 +01:00

libavutil

mem: minor simplification of the alignment hack code

2012-12-14 05:36:22 +01:00

libpostproc

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

libswresample

audioconvert/arm: require alignment of 16

2012-12-14 04:49:09 +01:00

libswscale

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

presets

presets: specify the codecs.

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

tests

fate: add BRSTM demuxer test

2012-12-11 11:34:47 +00:00

tools

qt-faststart: Check offset_count

2012-12-13 15:07:20 +01: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

lavfi: add aselect audio variant of select

2012-12-13 00:10:24 +01:00

cmdutils_common_opts.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

cmdutils.c

Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

2012-12-05 15:58:07 +01:00

cmdutils.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

configure/arm: print if thumb mode is enabled

2012-12-14 02:37:32 +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

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

ffmpeg_opt.c

ffmpeg: use avformat_seek_file() instead of av_seek_frame().

2012-12-02 00:06:02 +01:00

ffmpeg.c

ffmpeg: sub2video: use start and end time.

2012-12-12 15:05:50 +01:00

ffmpeg.h

ffmpeg: sub2video: use start and end time.

2012-12-12 15:05:50 +01:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-11-29 14:22:58 +01:00

ffprobe.c

ffprobe: free dictionary in opt_show_entries()

2012-11-23 18:49:26 +01:00

ffserver.c

ffserver: set oformat

2012-12-09 23:39:06 +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 geq filter.

2012-11-11 23:12:54 +01:00

MAINTAINERS

MAINTAINERS: add myself for my works

2012-12-08 15:18:08 +00: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

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +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%