FFmpeg

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

Go to file

Michael Niedermayer 35ce42e070 Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
	libavcodec/aacsbr.c
	libavutil/version.h

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

2012-10-23 15:00:27 +02:00

compat

compat/getopt: add {} to complex ifs

2012-10-21 18:05:22 +02:00

doc

Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'

2012-10-23 13:17:47 +02:00

libavcodec

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

libavdevice

lavc: add lavfi metadata support.

2012-10-21 17:29:10 +02:00

libavfilter

vf_aspect: unbreak avoption system

2012-10-22 13:12:15 +02:00

libavformat

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

libavresample

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

2012-10-14 14:46:13 +02:00

libavutil

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

libpostproc

pp: avoid overflow in w*h

2012-10-13 21:17:43 +02:00

libswresample

swresample: include ff_log2_tab for shared builds

2012-10-20 01:58:04 +02:00

libswscale

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

tools

qt-faststart: check fseeko() return codes

2012-10-22 22:42:51 +02:00

.gitignore

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

2012-10-20 12:37:52 +02:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

LVF demuxer

2012-10-22 23:22:39 +00:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

cmdutils: apply option to codec and format contexts if possible.

2012-10-22 22:24:23 +02:00

cmdutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-10-20 13:18:59 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

ffmpeg: fix negative array index

2012-10-22 13:58:19 +02:00

ffmpeg_opt.c

Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'

2012-10-23 13:05:52 +02:00

ffmpeg.c

ffmpeg: check avpicture_get_size() retuen value

2012-10-23 00:22:23 +02:00

ffmpeg.h

ffmpeg: Make video filter graph reinit user selectable

2012-10-17 00:06:12 +02:00

ffplay.c

ffplay: if there is no audio stream, use external clock by default

2012-10-21 17:18:12 +02:00

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-11 03:37:43 +02:00

ffserver.c

ffm_read_write_index: check lseek return code

2012-10-17 20:35:16 +02:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-10-11 15:55:41 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

add dshow maintainer

2012-10-12 19:52:05 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-16 14:15:16 +02:00

README

…

RELEASE

prepare 9_beta1 release

2012-10-11 18:36:40 +02: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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%