FFmpeg

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

Go to file

Michael Niedermayer f61498e1df Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'

Merge only for metadata, functionality had been previously integrated.

* commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc':
  h264: support frame parameter changes during frame-mt

Conflicts:
	libavcodec/h264.c

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

2012-12-19 21:59:33 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc: remove mention of fifo filter in the introduction.

2012-12-19 12:58:52 +01:00

libavcodec

h264: use must_reinit to simplify code

2012-12-19 21:46:11 +01:00

libavdevice

dshow: call CoUninitialize() on dshow_read_close()

2012-12-17 03:44:51 -02:00

libavfilter

lavfi/setpts: enable debug logs, and improve/extend debug messages

2012-12-19 11:49:54 +01:00

libavformat

au: return meaningful error codes

2012-12-19 20:16:35 +00:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-12-17 14:11:51 +01:00

libavutil

Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

2012-12-19 14:28:58 +01:00

libpostproc

pp: fix a few typo in the template.

2012-12-19 17:59:25 +01:00

libswresample

swr/doxy: fix missing quote in code example.

2012-12-16 21:04:54 +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: re-enable lavfi gradfun filter test.

2012-12-19 03:13:26 +01:00

tools

Fix "bistream" typo and add a check in tools/patcheck.

2012-12-18 02:47:34 +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

avfilter: add apad filter

2012-12-18 16:30:08 +01:00

cmdutils_common_opts.h

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

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

cmdutils.c

lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.

2012-12-16 20:39:39 +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

Merge remote-tracking branch 'qatar/master'

2012-12-18 15:00:05 +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_filter: use frame instead of decoder context pixel format

2012-12-19 21:46:11 +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: Fix shortest with libx264

2012-12-19 00:08:37 +01:00

ffmpeg.h

ffmpeg: sub2video: use start and end time.

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

ffplay.c

ffplay: provide some feedback in case the codec cannot be set

2012-12-16 10:58:02 +01:00

ffprobe.c

ffprobe: show pkt_size in frame

2012-12-15 11:46:47 +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: update my GPG key fingerprint

2012-12-18 23:08:02 +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

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%