FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer b97b4b58a6 Merge remote branch 'qatar/master'

* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
	ffmpeg.c

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

2011-05-10 04:03:17 +02:00

doc

developer.texi: update for git

2011-05-09 04:13:55 +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-05-10 04:03:17 +02:00

libavdevice

Make DV (sub) demuxer set proper pkt->pos values.

2011-05-02 18:38:01 +02:00

libavfilter

Merge remote branch 'qatar/master'

2011-05-09 04:50:56 +02:00

libavformat

Merge remote branch 'qatar/master'

2011-05-10 04:03:17 +02:00

libavutil

mem: Choose alignment at compile time depending on AVX enabledness.

2011-05-10 03:15:42 +02:00

libpostproc

Merge remote branch 'qatar/master'

2011-05-09 04:50:56 +02:00

libswscale

swscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat)

2011-05-10 00:37:20 +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-05-10 04:03:17 +02:00

tools

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

.gitignore

consolidate .gitignore patters into a single file

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

Changelog

DPX image encoder

2011-05-01 19:35:55 +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

Merge remote branch 'qatar/master'

2011-05-10 04:03:17 +02:00

cmdutils.h

Merge remote branch 'qatar/master'

2011-05-04 04:06:26 +02:00

common.mak

Merge remote-tracking branch 'newdev/master'

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

configure

Merge remote branch 'qatar/master'

2011-05-10 04:03:17 +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-05-10 04:03:17 +02:00

ffplay.c

ffplay: fix null pointer read when codec unavilable.

2011-05-07 20:03:04 +02:00

ffprobe.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

ffserver.c

Merge remote branch 'qatar/master'

2011-04-27 03:51:04 +02:00

ffserver.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00: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

add MicroDVD muxer and demuxer

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

Makefile

Makefile:Put lost tab back.

2011-05-06 02:21:52 +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.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%