ffmpeg

Go to file

Michael Niedermayer 83d4a8442c Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavfilter/allfilters.c
	libavformat/allformats.c

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

2012-12-29 14:27:38 +01:00

compat

…

doc

lavf/segment: add segment_frames option

2012-12-28 11:17:22 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-12-29 14:27:38 +01:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-12-29 14:27:38 +01:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-12-29 14:27:38 +01:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-12-29 14:27:38 +01:00

libavresample

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

libavutil

xtea: fix unused variable warning for config_small

2012-12-29 03:37:46 +01:00

libpostproc

libpostproc: alloc a few bytes more in the temporary buffer

2012-12-28 02:47:25 +01:00

libswresample

docs: add soxr documentation

2012-12-27 12:13:17 +01:00

libswscale

libswscale/swscale-test: fix some const correctness

2012-12-26 03:14:59 +01:00

presets

…

tests

mxfdec: Rescale audio stream duration from EditRate to SampleRate

2012-12-25 17:45:34 +01:00

tools

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

.gitignore

…

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Changelog: reword H264-MT entry

2012-12-24 01:57:45 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

cmdutils.h

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

Merge commit '69583bd3b1eba471366141c945030c163e073e02'

2012-12-29 13:05:37 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg: use the new swr -async parameter instead of a set of parameters.

2012-12-25 17:22:14 +01:00

ffmpeg_opt.c

ffmpeg_opt: fix recording time in->out carryover.

2012-12-20 17:45:43 +01:00

ffmpeg.c

ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate

2012-12-27 15:47:15 +01:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

2012-12-20 02:38:02 +01:00

ffplay.c

ffplay: fix type of time_diff in waveform display

2012-12-28 20:01:01 +01:00

ffprobe.c

ffprobe: show pkt_size in frame

2012-12-15 11:46:47 +01:00

ffserver.c

ffserver: set oformat

2012-12-09 23:39:06 +01:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

LICENSE

lavfi: add pp filter.

2012-12-23 19:03:36 +01:00

MAINTAINERS

MAINTAINERS: s/mjpeg.c/mjpeg*.c/

2012-12-28 13:04:44 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

…

RELEASE

…

version.sh

…

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.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%