FFmpeg

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

Go to file

Michael Niedermayer 15240feb99 Merge remote-tracking branch 'hexene/scratchpad'

* hexene/scratchpad:
  Move & Rename buildscript, remove tabs
  Fix regular build
  Support (H/W accelerated) H.264 decoding on Android via Stagefright
  Add build-script for Android
  C++ Support ;)

Conflicts:
	Changelog
	Makefile
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h

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

2011-09-14 01:23:16 +02:00

doc

Muxing WTV is supported.

2011-09-14 01:21:15 +02:00

ffpresets

Remove libx264 baseline ffpreset

2011-07-28 01:44:57 +02:00

libavcodec

Merge remote-tracking branch 'hexene/scratchpad'

2011-09-14 01:23:16 +02:00

libavdevice

dshow: indent

2011-09-12 19:22:13 +02:00

libavfilter

vf_remove_logo: domt access vf->next->query_format() directly but use the API.

2011-09-13 03:52:30 +02:00

libavformat

wtvenc: add some asserts because iam paranoid

2011-09-14 01:08:01 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

libpostproc

postprocess.c: filter name needs to be double 0 terminated

2011-08-26 20:28:54 +02:00

libswscale

swscale: drop redundant code.

2011-09-14 00:32:18 +02:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

tests

ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137

2011-09-13 17:29:23 +02:00

tools

Merge remote-tracking branch 'hexene/scratchpad'

2011-09-14 01:23:16 +02:00

.gitignore

gitignore: ignore .exp files, as generated by the MS linker on win32

2011-09-12 18:17:43 +02:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

Changelog

Merge remote-tracking branch 'hexene/scratchpad'

2011-09-14 01:23:16 +02:00

cmdutils_common_opts.h

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

common.mak

Merge remote-tracking branch 'hexene/scratchpad'

2011-09-14 01:23:16 +02:00

configure

Merge remote-tracking branch 'hexene/scratchpad'

2011-09-14 01:23:16 +02: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

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00: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

Doxyfile

doxygen: dont generate docs for avconv.c

2011-09-08 17:56:17 +02:00

ffmpeg.c

ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137

2011-09-13 17:29:23 +02:00

ffplay.c

ffplay: remove thread command line option code, it is unneeded for -threads X to work.

2011-09-13 15:05:42 +02:00

ffprobe.c

ffprobe: rename print_{int,str}_f callbacks to print_{integer,string}.

2011-09-13 23:06:11 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-09-05 03:10:45 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

MAINTAINERS

MAINTAINERS: add a "Releases" section

2011-06-24 11:15:26 +02:00

Makefile

Merge remote-tracking branch 'hexene/scratchpad'

2011-09-14 01:23:16 +02:00

README

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

RELEASE

set Release to 0.8.2.git. We are at 0.8.2 and a bit further.

2011-08-13 03:39:58 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-31 00:34:47 +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.

2) Licensing
------------

* See the LICENSE file.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%