ffmpeg

Go to file

Michael Niedermayer 56ae5926f7 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: introduce encoding support
  libopenjpeg: rename decoder source file.
  RTMPTS protocol support
  RTMPS protocol support
  avconv: print an error message when demuxing fails.
  tscc2: DCT output should not be clipped
  rtmp: Rename rtmphttp to ffrtmphttp

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/libopenjpegenc.c
	libavcodec/version.h
	libavformat/version.h

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

2012-07-18 01:27:19 +02:00

compat

Merge remote-tracking branch 'qatar/master'

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

doc

Merge remote-tracking branch 'qatar/master'

2012-07-18 01:27:19 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-07-18 01:27:19 +02:00

libavdevice

v4l2: use av_assert

2012-07-08 17:59:56 +02:00

libavfilter

avfiltergraph: document a catch in request_oldest().

2012-07-17 23:47:33 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-07-18 01:27:19 +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

sws: handle non native rgb<->rgb convertions

2012-07-17 14:40:59 +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

ptx: correct decoding

2012-07-17 17:06:24 +00: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

Merge remote-tracking branch 'qatar/master'

2012-07-18 01:27:19 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2012-07-08 22:33:32 +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-18 01:27:19 +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

Merge remote-tracking branch 'qatar/master'

2012-07-18 01:27:19 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

ffprobe.c

ffprobe: reindent after the previous commit

2012-07-15 16:27:22 +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

Remove libpostproc.

2012-02-23 19:36:16 +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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%