FFmpeg

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

Go to file

Michael Niedermayer 32c3038734 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: swscale: Place inline assembly code under appropriate #ifdefs
  rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
  configure: Remove redundant RTMPT/RTMPTS dependencies
  configure: add filtering of host cflags/ldflags
  configure: initialise all flag filters at the same place
  configure: add filtering of linker flags
  configure: name some variables more consistently
  configure: remove filter_cppflags
  configure: set icc_version where it is needed
  mpegenc: remove disabled code

Conflicts:
	configure
	libavformat/movenc.c
	libswscale/x86/swscale_mmx.c

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

2012-07-22 05:05:02 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-07-12 23:57:00 +02:00

doc

doc/outdevs: fix @code{} syntax in caca device docs

2012-07-21 10:17:02 +02:00

libavcodec

tscc: employ more meaningful return values

2012-07-22 01:21:53 +00:00

libavdevice

libcaca output device

2012-07-21 03:33:02 +00:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-07-21 22:20:49 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-07-22 05:05:02 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

libavutil

lavu: disable av_uninit for clang

2012-07-16 19:30:13 +00:00

libpostproc

pp: check that the argument is not NULL as this is not supported

2012-07-07 19:14:21 +02:00

libswresample

lswr: channel_map requires input conversion.

2012-07-17 09:50:36 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-07-22 05:05:02 +02:00

mt-work

Update todo

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

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-07-21 04:25:11 +02:00

tools

tools/bisect: rename to tools/bisect-create

2012-07-07 14:51:51 +02:00

.gitignore

tools/bisect: rename temporary file and add it to git ignore

2012-07-07 13:15:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

Changelog

Changelog: add entry for the caca device

2012-07-21 10:15:44 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

cmdutils/alloc_buffer: fix typo

2012-07-20 16:42:29 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-07-04 00:32:31 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-07-22 05:05:02 +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

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

Doxyfile

remove avconv from Doxyfile

2012-01-25 22:47:45 +01:00

ffmpeg.c

ffmpeg: probe buffersinks once more after EOF.

2012-07-20 10:18:45 +02:00

ffplay.c

ffplay: fix warning that i just mistakenly introduced

2012-07-20 03:47:11 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2012-07-19 22:01:31 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-06-20 20:47:46 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-03-26 20:52:52 +02:00

LICENSE

Merge remote-tracking branch 'qatar/master'

2012-02-22 02:24:18 +01:00

MAINTAINERS

FireWire DV/HDV input device using libiec61883

2012-07-05 13:02:49 +02:00

Makefile

Makefile: remove checkheaders from the main check target

2012-06-29 00:05:40 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update, seem this has been forgotten

2012-07-01 21:21:07 +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 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.

Languages

C 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%