FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

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

* qatar/master:
  avconv: Fix spelling errors.
  aac: Only set sample rate and object type from ADTS if output hasn't been configured.
  aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
  aac: Only output configure if audio was found.
  avconv: save two levels of indentation in flush_encoders()
  avconv: factor flushing encoders out of output_packet().
  avconv: factor out initializing input streams.
  avconv: remove -intra option.
  avconv: reset streamid_map between output files.
  avconv: make timer_start a local var in transcode().
  avconv: cosmetics, move OutputStream.
  avconv: remove two unused macros.

Conflicts:
	avconv.c

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

2011-08-19 00:53:42 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2011-08-19 00:53:42 +02:00

ffpresets

Remove libx264 baseline ffpreset

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

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-08-19 00:53:42 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

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

libavfilter

lavfi: add aresample filter

2011-08-17 13:12:40 +02:00

libavformat

xmv: Read the video packet data first, then swap its bytes

2011-08-18 23:56:12 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2011-08-18 10:56:08 +02:00

libpostproc

Merge remote-tracking branch 'qatar/master'

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

libswscale

Merge remote-tracking branch 'qatar/master'

2011-08-18 10:56:08 +02:00

mt-work

Update todo

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

tests

Merge remote-tracking branch 'qatar/master'

2011-08-19 00:53:42 +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-19 00:53:42 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2011-08-19 00:53:42 +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-18 10:56:08 +02:00

ffplay.c

ffplay: do not erase the content of vfilters

2011-08-17 10:29:34 +02:00

ffprobe.c

ffprobe: in value_string(), do not print trailing space in case of no suffix

2011-08-17 10:29:34 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02: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

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

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02: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.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%