ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-12 13:23:48 +00:00

T

Michael Niedermayer e3e09f2bad Merge remote-tracking branch 'qatar/master'

* qatar/master:
  os_support: Choose between direct.h and io.h using a configure check
  os_support: Include io.h instead of direct.h on mingw32ce
  x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
  swscale: Remove two bogus asserts
  ac3: move ac3_downmix() from dsputil to ac3dsp
  lavr/audio_mix_matrix: acknowledge the existence of LFE2.
  mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
  lavu/audioconvert: add a second low frequency channel.

Conflicts:
	doc/APIchanges
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
	libavcodec/mlp_parser.c
	libavutil/audioconvert.c
	libavutil/version.h

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

2012-09-13 15:35:50 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

libavdevice

lavd/lavfi: apply stylistic fixes to the options help fields

2012-09-11 22:56:35 +02:00

libavfilter

lavfi/aresample: set buffer properties after copy.

2012-09-13 12:05:19 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

libpostproc

postproc: Fix unprotected inline asm

2012-09-11 20:12:14 +02:00

libswresample

swr: add av_cold to init/free functions

2012-09-09 02:26:20 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

mt-work

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-09-10 14:06:20 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

.gitignore

gitignore: codec_names.h is no more

2012-09-07 14:59:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

Changelog

Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'

2012-09-13 15:22:16 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

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

cmdutils.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

cmdutils.h

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-08-30 17:28:21 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +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

Merge remote-tracking branch 'qatar/master'

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

ffmpeg_filter.c

ffmpeg_filter: fix unsafe snprintf() usage

2012-09-09 14:11:03 +02:00

ffmpeg_opt.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffmpeg.c

ffmpeg: Only include unistd.h if it exists

2012-09-11 22:59:43 +02:00

ffmpeg.h

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffplay.c

ffplay: increase sample array buffer

2012-09-11 22:15:38 +02:00

ffprobe.c

ffprobe: print start_pts and duration_ts stream information

2012-09-12 10:22:29 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-09-12 11:46:47 +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-08-30 17:28:21 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

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

MAINTAINERS

Add CPiA video decoder

2012-08-31 00:24:11 +02:00

Makefile

Makefile: remove old codec_names.h on distclean

2012-09-07 14:59:01 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update, seem this has been forgotten

2012-07-01 21:21:07 +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.