ffmpeg

Go to file

Michael Niedermayer 3a7ef8dc44 Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'

* commit '57231e4d5b467833fb289439cd35a92513bb55c1':
  tak: demuxer, parser, and decoder

Not merged as requested by Author and Maintainer of tak in FFmpeg.
I just merged a few typo fixes and minor cosmetic improvments.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/tak.c
	libavcodec/tak.h
	libavcodec/tak_parser.c
	libavcodec/takdec.c
	libavcodec/version.h
	libavformat/takdec.c
	libavformat/version.h

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

2012-12-08 15:54:18 +01:00

compat

…

doc

doc/filters: move volumedetect documentation below volume

2012-12-08 15:41:12 +01:00

libavcodec

Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'

2012-12-08 15:54:18 +01:00

libavdevice

lavd/lavfi: fix float.h include.

2012-12-06 15:09:47 +01:00

libavfilter

lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c

2012-12-08 15:40:07 +01:00

libavformat

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

2012-12-08 14:58:56 +01:00

libavresample

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

2012-11-28 13:27:18 +01:00

libavutil

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

2012-12-08 14:58:56 +01:00

libpostproc

pp: add SSE2 deInterlaceInterpolateCubic().

2012-11-18 16:21:59 +01:00

libswresample

resample: remove disabled debug code

2012-12-06 02:51:26 +01:00

libswscale

sws_scale: check input against NULL

2012-12-07 21:50:07 +01:00

presets

…

tests

Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'

2012-12-07 15:21:41 +01:00

tools

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

2012-11-13 13:21:21 +00:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

tak: demuxer, parser, and decoder

2012-12-07 16:15:02 -05:00

cmdutils_common_opts.h

…

cmdutils.c

Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

2012-12-05 15:58:07 +01:00

cmdutils.h

…

common.mak

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

2012-11-23 13:30:51 +01:00

configure

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

2012-12-08 14:58:56 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

ffmpeg_opt.c

ffmpeg: use avformat_seek_file() instead of av_seek_frame().

2012-12-02 00:06:02 +01:00

ffmpeg.c

ffmpeg: small indent fix.

2012-12-04 16:40:11 +01:00

ffmpeg.h

ffmpeg: fix swr filter_type for auto inserted aresample filters

2012-11-26 04:06:19 +01:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-11-29 14:22:58 +01:00

ffprobe.c

ffprobe: free dictionary in opt_show_entries()

2012-11-23 18:49:26 +01:00

ffserver.c

ffserver remove CONFIG_NOCUTILS check

2012-11-27 14:41:41 +01:00

INSTALL

…

library.mak

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

2012-11-23 13:30:51 +01:00

LICENSE

…

MAINTAINERS

…

Makefile

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +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%