Go to file

Michael Niedermayer 3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

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

2014-08-09 22:19:45 +02:00

compat

compat/w32pthreads: add return value to pthread_cond_init().

2014-05-26 11:33:42 +02:00

doc

Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

2014-08-09 12:11:13 +02:00

libavcodec

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

2014-08-09 22:19:45 +02:00

libavdevice

avdevice/lavfi: Simplify non-AV stream check

2014-08-07 15:41:17 +02:00

libavfilter

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

2014-08-09 22:19:45 +02:00

libavformat

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

2014-08-09 22:19:45 +02:00

libavresample

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

2014-08-09 22:19:45 +02:00

libavutil

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

2014-08-09 22:19:45 +02:00

libpostproc

…

libswresample

swresample/swresample: Treat mono as planar

2014-08-04 03:05:05 +02:00

libswscale

Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

2014-08-09 22:19:45 +02:00

presets

presets: remove moldering iPod presets

2014-06-17 16:15:04 -08:00

tests

avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation

2014-08-09 05:05:09 +02:00

tools

tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

2014-07-08 01:56:33 +02:00

.gitignore

Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

2014-08-01 15:03:22 +02:00

arch.mak

…

Changelog

libavformat: Add Icecast protocol

2014-08-04 13:33:44 +02:00

cmdutils_common_opts.h

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

cmdutils_opencl.c

cmdutils_opencl: Use av_malloc_array()

2014-07-01 03:49:36 +02:00

cmdutils.c

cmdutils: ignore sws_flags if swscale is not enabled

2014-06-29 17:27:23 +02:00

cmdutils.h

ffmpeg: add -devices param

2014-05-28 03:52:50 +02:00

common.mak

Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

2014-05-20 03:33:30 +02:00

configure

Merge commit '444c73583d2848a542330c03949e1f933ac68f53'

2014-08-08 21:38:58 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_dxva2.c

…

ffmpeg_filter.c

ffmpeg_filter: refuse to configure input without a decoder.

2014-07-30 14:40:45 +02:00

ffmpeg_opt.c

Do not automatically map subtitles if the decoder and encoder properties are different.

2014-08-07 13:18:00 +02:00

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

2014-05-12 02:44:28 +02:00

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: Do not fail if a demuxer and decoder use the same option identifer

2014-08-04 13:33:44 +02:00

ffmpeg.h

ffmpeg: Do not fail if a demuxer and decoder use the same option identifer

2014-08-04 13:33:44 +02:00

ffplay.c

replace calls to url_feof() with avio_feof()

2014-08-08 00:48:38 +02:00

ffprobe.c

ffprobe: print some basic information about avframe side data

2014-07-30 19:23:08 +02:00

ffserver.c

ffserver: initialize pbuffer in prepare_sdp_description()

2014-08-02 18:32:37 +02:00

INSTALL.md

INSTALL: add markdown syntax

2014-05-28 22:38:38 +02:00

library.mak

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

2014-07-22 02:45:45 +02:00

LICENSE.md

LICENCE: add markdown syntax

2014-05-28 22:38:28 +02:00

MAINTAINERS

MAINTAINERS: update list of releases i maintain

2014-07-28 06:16:34 +02:00

Makefile

Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

2014-07-22 03:06:43 +02:00

README.md

README: add markdown syntax

2014-05-28 22:38:11 +02:00

RELEASE

RELEASE: update, we are after 2.3 not 2.2

2014-07-28 03:11:04 +02:00

RELEASE_NOTES

RELEASE_NOTES: fix WebVTT decoder typo (-> encoder)

2014-07-25 13:22:00 +02:00

version.sh

version.sh: Print versions based on the last git tag for release branches

2014-07-28 15:44:59 +02:00

README.md

FFmpeg README

Documentation

Read the documentation in the doc/ directory in git.

You can also view it online at http://ffmpeg.org/documentation.html

Licensing

See the LICENSE file.

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%