Go to file

Michael Niedermayer 313d75cd43 Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
  http: enable icy metadata by default.

Conflicts:
	Changelog
	libavformat/http.c

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

2014-08-13 22:54:31 +02:00

compat

Merge commit '428b0578c64241fc677fed7083cc8fe65e10f32e'

2014-08-13 18:33:06 +02:00

doc

Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

2014-08-13 22:54:31 +02:00

libavcodec

vp9: ignore reference segmentation map if error_resilience flag is set.

2014-08-13 20:46:00 +02:00

libavdevice

Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'

2014-08-10 00:26:45 +02:00

libavfilter

avfilter/dctdnoiz: add slice threading

2014-08-13 19:32:00 +02:00

libavformat

Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

2014-08-13 22:54:31 +02:00

libavresample

Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

2014-08-10 18:20:37 +02:00

libavutil

Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'

2014-08-13 22:39:54 +02:00

libpostproc

bump libpostproc and libswresample

2014-08-10 01:17:02 +02:00

libswresample

swresample: check av_opt_set for failure in swr_alloc_set_opts()

2014-08-11 01:34:34 +02:00

libswscale

lsws: duplicate ff_log2_tab

2014-08-12 20:52:21 +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

Add missing initialization for AVProbeData.

2014-08-11 21:10:22 +02:00

.gitignore

Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

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

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

Changelog

Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'

2014-08-13 22:54:31 +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

avutil: turn arm setend into a cpuflag

2014-08-13 14:50:15 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_dxva2.c

Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'

2014-04-30 00:46:38 +02:00

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

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

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 use SWR_CH_MAX

2014-08-10 01:08:45 +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

lavc/flacenc: add sse4 version of the 16-bit lpc encoder

2014-08-13 01:14:47 +02:00

MAINTAINERS

avfilter: ported lenscorrection filter from frei0r

2014-08-12 03:33:30 +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

Prepare for 11_alpha2 Release

2014-08-10 10:07:55 -04:00

RELEASE_NOTES

reset and complete RELEASE_NOTES for the next version

2014-08-13 21:03:55 +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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%