FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Go to file

Michael Niedermayer 65e63072f8 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Return a proper error code instead of -1
  rtmp: Check malloc calls
  rtmp: Check ff_rtmp_packet_create calls
  lavfi: add audio mix filter
  flvdec: Make sure sample_rate is set to the updated value
  tqi: Pass errors from the MB decoder

Conflicts:
	Changelog
	doc/filters.texi
	libavcodec/eatqi.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

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

2012-05-25 00:38:16 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

libavdevice

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-05-10 23:30:42 +02:00

libavutil

lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h

2012-05-24 00:42:31 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

2012-02-29 04:25:13 +01:00

libswresample

swr: check return value of swr_inject_silence/drop_output.

2012-05-22 20:37:12 +02:00

libswscale

Add yuva422p pix_fmt.

2012-05-08 08:39:37 +02:00

mt-work

…

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-05-23 21:48:31 +02:00

.gitignore

doc/examples: add programs to .gitignore.

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

arch.mak

build: Consistently handle conditional compilation for all optimization OBJS.

2012-04-12 09:00:49 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

cmdutils: allow to specify a stream by its ID.

2012-05-20 12:47:27 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-05-10 02:25:41 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00

configure

Build the aformat filter when ffmpeg is built.

2012-05-24 12:26:31 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

remove avconv from Doxyfile

2012-01-25 22:47:45 +01:00

ffmpeg.c

ffmpeg: use AUTO_INSERT_FILTER() for -async option.

2012-05-24 23:33:21 +02:00

ffplay.c

ffplay: set base in dr1 allocation.

2012-05-24 18:40:49 +02:00

ffprobe.c

ffprobe: remove ad-hoc behavior when nb_fmt_entries_to_show is 1

2012-05-21 10:32:25 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-05-06 21:53:19 +02:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-03-26 20:52:52 +02:00

LICENSE

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

MAINTAINERS

MAINTAINERS: update versions

2012-05-24 21:15:01 +02:00

Makefile

doc/examples: install them with the shared data.

2012-05-19 12:28:59 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

RELEASE: bump to current version (0.10.2).

2012-03-26 22:47:28 +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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%