FFmpeg

T

Michael Niedermayer c88caa522c Merge remote branch 'qatar/master'

* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

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

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

doc

Merge remote branch 'qatar/master'

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

ffpresets

Update qmin/qmax values for libx264 presets

2011-02-08 15:59:30 -08:00

libavcodec

Merge remote branch 'qatar/master'

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

libavdevice

Add support for pcm_f32* to alsa.

2011-04-05 16:12:41 +02:00

libavfilter

Align stack variables manually in yadif x86 code, should fix ticket25

2011-04-07 01:49:06 +02:00

libavformat

Merge remote branch 'qatar/master'

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

libavutil

Install libavutil/{aes,sha}.h

2011-04-07 17:54:52 +02:00

libpostproc

Merge remote-tracking branch 'newdev/master'

2011-03-19 20:05:11 +01:00

libswscale

Merge remote branch 'qatar/master'

2011-04-07 03:32:26 +02:00

mt-work

Merge remote-tracking branch 'ffmpeg-mt/master'

2011-03-30 02:58:38 +02:00

tests

Merge remote branch 'qatar/master'

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

tools

patcheck: warn about assert usage

2011-03-18 18:49:36 +01:00

.gitignore

consolidate .gitignore patters into a single file

2011-01-18 21:32:05 +01:00

Changelog

Add PlayStation Portable PMP format demuxer

2011-04-06 19:30:42 +02:00

cmdutils_common_opts.h

Implement a -pix_fmts option for listing all the supported pixel

2009-12-21 21:53:03 +00:00

cmdutils.c

cmdutils: remove list_fmts(), simplify

2011-03-26 14:40:30 +01:00

cmdutils.h

cmdutils: remove list_fmts(), simplify

2011-03-26 14:40:30 +01:00

common.mak

Merge remote-tracking branch 'newdev/master'

2011-04-01 02:58:15 +02:00

configure

Merge remote branch 'qatar/master'

2011-04-06 02:59:49 +02:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

CREDITS

Revert "partially rename FFmpeg to Libav"

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

Doxyfile

Merge remote-tracking branch 'newdev/master'

2011-03-19 20:05:11 +01:00

ffmpeg.c

Merge remote branch 'qatar/master'

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

ffplay.c

Merge remote branch 'qatar/master'

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

ffprobe.c

ffprobe: provide format parameters to av_open_input_file()

2011-03-26 14:41:51 +01:00

ffserver.c

Merge remote branch 'qatar/master'

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

ffserver.h

Add FFMPEG_ prefix to all multiple inclusion guards.

2007-10-17 09:37:46 +00:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

MAINTAINERS

add MicroDVD muxer and demuxer

2011-04-04 01:29:40 +02:00

Makefile

Drop checkheaders from check, its useless

2011-04-06 23:21:44 +02:00

README

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

subdir.mak

Revert "Remove support for stripping executables"

2011-04-01 00:24:12 +02:00

version.sh

Merge remote-tracking branch 'newdev/master'

2011-03-19 20:05:11 +01:00

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.