FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00

Go to file

Michael Niedermayer 9dbedf331e Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
	libavcodec/bmp.c
	tests/ref/fate/yop

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

2012-12-24 15:48:02 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc/filters: remove outdated comments

2012-12-24 01:36:21 +01:00

libavcodec

Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

2012-12-24 15:48:02 +01:00

libavdevice

Support H264 over video4linux2.

2012-12-21 18:12:29 +01:00

libavfilter

Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'

2012-12-24 15:29:15 +01:00

libavformat

Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'

2012-12-24 15:09:58 +01:00

libavresample

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

libavutil

Merge commit '418693bdc5edad72b0d055f741931612d797eb05'

2012-12-23 13:32:40 +01:00

libpostproc

libpostproc: fix leak of 2kb

2012-12-23 04:55:14 +01:00

libswresample

swr/doxy: fix missing quote in code example.

2012-12-16 21:04:54 +01:00

libswscale

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

2012-12-24 15:48:02 +01:00

tools

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +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

Changelog: reword H264-MT entry

2012-12-24 01:57:45 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

cmdutils.h

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'

2012-12-24 15:09:58 +01: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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

ffmpeg_filter.c

Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'

2012-12-19 22:04:03 +01:00

ffmpeg_opt.c

ffmpeg_opt: fix recording time in->out carryover.

2012-12-20 17:45:43 +01:00

ffmpeg.c

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

2012-12-20 02:38:02 +01:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

2012-12-20 02:38:02 +01:00

ffplay.c

ffplay: fix another use of context instead of frame parameters

2012-12-22 03:41:55 +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 pp filter.

2012-12-23 19:03:36 +01:00

MAINTAINERS

NIST SPHERE demuxer

2012-12-23 21:22:43 +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

prepare 9_beta3 release

2012-12-21 15:16:33 +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.

Languages

C 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%