FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 5afdb3e6b1 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
  http: Pass the proper return code of net IO operations
  http: Add 'post_data', a new option which sets custom HTTP post data
  lavfi: amix: check active input count before calling request_samples
  vp8: move block coeff arithcoder on stack.
  mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.

Conflicts:
	libavformat/ac3dec.c
	libavformat/mp3dec.c
	tests/fate/ac3.mak

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

2012-05-31 21:27:42 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38:32 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-05-31 21:27:42 +02:00

libavdevice

avdevice: bump soname due to lavf soname bump

2012-05-25 12:22:21 +02:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-05-31 21:27:42 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-05-31 21:27:42 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-05-30 19:32:06 +02:00

libavutil

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

libpostproc

libpostproc: fix out of array accesses detected by AddressSanitizer.

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

libswresample

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38:32 +02:00

libswscale

Add yuva422p pix_fmt.

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

mt-work

Update todo

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

presets

presets: specify the codecs.

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

tests

fate: dont freopen() stdout

2012-05-31 02:56:56 +02:00

tools

probetest: allow specifying parameters on the command line

2012-05-31 15:53:58 +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

Changelog: apply misc formatting fixes

2012-05-29 13:06:38 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

cmdutils: replace 1 line #ifs by if()

2012-05-30 15:45:05 +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

Merge remote-tracking branch 'qatar/master'

2012-05-30 04:38:32 +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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

Doxyfile

remove avconv from Doxyfile

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

ffmpeg.c

ffmpeg: allow overriding input top field first

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

ffplay.c

ffplay: force exit when filter configuration fails

2012-05-24 23:48:52 +02:00

ffprobe.c

ffprobe: fix C escaping.

2012-05-30 01:07:41 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

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

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

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

LICENSE

Remove libpostproc.

2012-02-23 19:36:16 +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

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