ffmpeg

Go to file

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

* qatar/master:
  lavf: simplify is_intra_only() by using codec descriptors.
  lavc: add an intra-only codec property.
  lavc: add codec descriptors.
  lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
  dict: move struct AVDictionary definition to dict.c
  dict: add av_dict_count()

Conflicts:
	doc/APIchanges
	libavcodec/old_codec_ids.h
	libavformat/utils.c
	libavutil/version.h

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

2012-08-11 15:01:45 +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-08-11 15:01:45 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-08-11 15:01:45 +02:00

libavdevice

lavd/x11grab: deprecate "nomouse" specification in filename

2012-08-08 23:43:37 +02:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-08-11 15:01:45 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-08-11 15:01:45 +02:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

libswresample

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

mt-work

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

tools

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

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

Changelog

lavfi: add asetpts audio filter

2012-08-09 01:03:05 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

cmdutils: show options in show_help_children only if the context has options

2012-08-10 23:14:44 +02:00

cmdutils.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

common.mak

checkheaders: Rename HEADEROBJS to HOBJS

2012-08-09 05:02:45 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +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

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

ffmpeg_opt.c

ffmpeg: dont auto match videostreams with attachment pics.

2012-08-10 17:23:18 +02:00

ffmpeg.c

ffmpeg: Allocate new buffer for bitstream filter when buffer shifted

2012-08-10 04:36:43 +02:00

ffmpeg.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

ffplay.c

ffplay: fix warning that i just mistakenly introduced

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

ffprobe.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

ffserver.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45: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-08-09 00:51:02 +02:00

LICENSE

LICENSE: Document all GPL files

2012-08-04 04:03:08 +02:00

MAINTAINERS

Canopus Lossless decoder

2012-08-01 22:02:19 -04:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-08-10 04:46:13 +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%