ffmpeg

Go to file

Michael Niedermayer 41bdef1d39 Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'

* commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b':
  vdpau: Add MPEG-4 decoding via hwaccel infrastructure
  vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/version.h

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

2013-01-14 13:48:30 +01:00

compat

…

doc

Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'

2013-01-14 13:29:00 +01:00

libavcodec

Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'

2013-01-14 13:48:30 +01:00

libavdevice

…

libavfilter

vsrc_testsrc: Fix assignments in if()

2013-01-14 05:05:40 +01:00

libavformat

rtmpproto: Fix assignments in if()

2013-01-14 05:05:42 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-09 12:30:14 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2013-01-12 13:42:42 +01:00

libpostproc

…

libswresample

swr/dither: fix division by 0

2013-01-14 02:57:00 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2013-01-05 13:37:30 +01:00

presets

…

tests

Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'

2013-01-13 13:54:52 +01:00

tools

…

.gitignore

…

arch.mak

…

Changelog

Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'

2013-01-14 13:29:00 +01:00

cmdutils_common_opts.h

…

cmdutils.c

…

cmdutils.h

lavf: remove nonexistent symbols

2013-01-11 10:07:52 +00:00

common.mak

…

configure

Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'

2013-01-14 13:48:30 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases

2013-01-13 15:09:09 +01:00

ffmpeg.c

add note on windows pipe

2013-01-06 17:47:49 +01:00

ffmpeg.h

…

ffplay.c

ffplay: fix sws_flags

2013-01-13 22:48:28 +01:00

ffprobe.c

…

ffserver.c

…

INSTALL

…

library.mak

…

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

…

README

…

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01:00

version.sh

…

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.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%