FFmpeg

T

Michael Niedermayer bb2f4ae434 Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support

Conflicts:
	libswscale/output.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

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

2013-01-28 14:11:31 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

ffmpeg: remove -crop* and -pad* options

2013-01-27 16:56:47 +01:00

libavcodec

Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

2013-01-28 14:11:31 +01:00

libavdevice

lavd/v4l2: use avcodec_find_decoder in list_formats

2013-01-28 00:11:49 +01:00

libavfilter

lavfi/vf_drawtext: default to expansion=normal.

2013-01-26 12:52:19 +01:00

libavformat

Write forced track flag to matroska files.

2013-01-27 23:24:52 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-18 13:54:38 +01:00

libavutil

Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

2013-01-26 13:34:30 +01:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

swr/ build_filter: use av_calloc() fix buffer overflow

2013-01-27 05:58:47 +01:00

libswscale

Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

2013-01-28 14:11:31 +01:00

presets

presets: specify the codecs.

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

tests

swscale: GBRP output support

2013-01-27 15:28:07 -05:00

tools

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

.gitignore

.gitignore: add /doc/examples/pc-uninstalled

2013-01-17 17:59:18 +00:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

remove av_strnstr from Changelog

2013-01-26 14:04:30 +00:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

cmdline: fix -- to escape files starting with -

2013-01-19 14:50:36 +01:00

cmdutils.h

lavf: remove nonexistent symbols

2013-01-11 10:07:52 +00:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'

2013-01-25 14:14:21 +01: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

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01: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

ffmpeg_filter.c

ffmpeg: support filtering of unknown channel layouts.

2013-01-26 11:15:38 +01:00

ffmpeg_opt.c

ffmpeg: remove -crop* and -pad* options

2013-01-27 16:56:47 +01:00

ffmpeg.c

ffmpeg: implement -force_key_frames expression evalution

2013-01-27 16:56:47 +01:00

ffmpeg.h

ffmpeg: implement -force_key_frames expression evalution

2013-01-27 16:56:47 +01:00

ffplay.c

ffplay: flush video filters on seek

2013-01-19 00:48:06 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

ffserver: add missing padding to extradata.

2012-12-30 22:22:18 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01: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.