ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-04 13:03:51 +00:00

T

Michael Niedermayer 41bf67d8d4 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
  avconv: remove a write-only variable
  avconv: remove pointless parameter from new_*_stream().
  avconv: cosmetics, move code
  avconv: cosmetics -- move copy_chapters().
  avconv: cosmetics -- move parse_forced_key_frames().
  lavc: add audio flag to the 'b' option, deprecate 'ab'.
  avconv: rename sameq to same_quant
  doc/avconv: add forgotten end of chapter.
  Changelog: document avconv incompatibilities with ffmpeg.
  avconv: replace -vcodec/-acodec/-scodec with a better system.
  avconv: remove presets.
  svq3: propagate codec memory allocation failure in context init

Conflicts:
	Changelog
	avconv.c
	libavcodec/options.c

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

2011-08-16 23:47:35 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

ffpresets

Remove libx264 baseline ffpreset

2011-07-28 01:44:57 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

libavfilter

af_format: prefer strtok_r() over strsep()

2011-08-16 17:00:57 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

libavutil

fifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()

2011-08-14 01:56:28 +02:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2011-07-06 23:57:11 +02:00

libswscale

sws: remove hScale16NX_c()

2011-08-14 19:34:48 +02:00

mt-work

Update todo

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

tests

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

tools

lavfi-showfiltfmts: extend output format for specifying audio data

2011-07-28 10:04:09 +02:00

.gitignore

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

cmdutils_common_opts.h

Make all option parsing functions match the function pointer type through which they are called.

2011-06-30 11:49:48 -04:00

cmdutils.c

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

cmdutils.h

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

configure

af_format: prefer strtok_r() over strsep()

2011-08-16 17:00:57 +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 'qatar/master'

2011-07-14 20:44:58 +02:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

ffplay.c

Fix compilation with --disable-avfilter.

2011-08-16 23:31:09 +02:00

ffprobe.c

NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'

2011-08-10 16:29:20 +02:00

ffserver.c

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

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

MAINTAINERS: add a "Releases" section

2011-06-24 11:15:26 +02:00

Makefile

Fix NASM include directive

2011-08-15 11:24:35 -07:00

README

Revert "partially rename FFmpeg to Libav"

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

RELEASE

set Release to 0.8.2.git. We are at 0.8.2 and a bit further.

2011-08-13 03:39:58 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-31 00:34:47 +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.

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

* See the LICENSE file.