FFmpeg

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

Go to file

Michael Niedermayer 6912e7a008 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
	configure
	libavutil/mem.c

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

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

compat

Merge remote-tracking branch 'qatar/master'

2012-10-14 15:11:34 +02:00

doc

examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame()

2012-10-20 12:06:45 +02:00

libavcodec

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

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

libavdevice

caca: fix 10l typo

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

libavfilter

vf_mp: fix null ptr deref in case of ENOMEM

2012-10-19 19:59:38 +02:00

libavformat

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

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

libavresample

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

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

libavutil

Merge remote-tracking branch 'qatar/master'

2012-10-20 13:18:59 +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

sws-test: parse command line args before initing contexts

2012-10-17 11:56:36 +02:00

presets

…

tests

Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

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

tools

tools/ffeval: do not use UNIX-specific /dev/std{in,out} files

2012-10-16 13:51:44 +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

Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

2012-10-19 13:47:47 +02:00

cmdutils_common_opts.h

…

cmdutils.c

cmdutils: add missing check for ftell() return

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

cmdutils.h

…

common.mak

…

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

…

ffmpeg_filter.c

ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams

2012-10-16 01:04:42 +02:00

ffmpeg_opt.c

Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

2012-10-17 14:30:25 +02:00

ffmpeg.c

ffmpeg: Make video filter graph reinit user selectable

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

ffmpeg.h

ffmpeg: Make video filter graph reinit user selectable

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

ffplay.c

ffplay: Prevent 0/0 aspect from being passed on to lavfi

2012-10-14 23:40:14 +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

…

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%