FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00

T

Michael Niedermayer e16665bf72 Merge remote branch 'qatar/master'

* qatar/master:
  Use av_log_ask_for_sample() to request samples from users.
  Make av_log_ask_for_sample() accept a variable number of arguments.
  vqavideo: We no longer need to ask for version 1 samples.
  aacdec: indentation cosmetics

Conflicts:
	libavcodec/utils.c

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

2011-04-23 01:09:43 +02:00

doc

FLV muxing is supported.

2011-04-22 19:24:17 +02:00

ffpresets

Remove now useless ffpresets for x264, use -preset

2011-04-16 16:59:39 -07:00

libavcodec

Merge remote branch 'qatar/master'

2011-04-23 01:09:43 +02:00

libavdevice

Merge remote branch 'qatar/master'

2011-04-22 03:54:30 +02:00

libavfilter

mp: remove unused variable outlink in end_frame

2011-04-21 18:46:03 +02:00

libavformat

Merge remote branch 'qatar/master'

2011-04-23 01:09:43 +02:00

libavutil

error: remove symbols which were deprecated before the big bump

2011-04-22 10:21:21 +02:00

libpostproc

Bump major versions of all libraries.

2011-04-18 20:19:47 +02:00

libswscale

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +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-22 03:54:30 +02:00

tools

10l, commit that should have been stashed into the merge.

2011-04-17 23:59:00 +02:00

.gitignore

…

Changelog

Merge remote branch 'qatar/master'

2011-04-21 03:37:05 +02:00

cmdutils_common_opts.h

…

cmdutils.c

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +02: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-22 03:54:30 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

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

Cosmetics: Rename variable daemon as run_as_daemon.

2011-04-22 18:49:44 +02:00

ffplay.c

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +02:00

ffprobe.c

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +02:00

ffserver.c

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +02:00

ffserver.h

…

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

Revert "partially rename FFmpeg to Libav"

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

MAINTAINERS

add MicroDVD muxer and demuxer

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

Makefile

Merge remote branch 'qatar/master'

2011-04-22 03:54:30 +02:00

README

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01: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.