Go to file

Michael Niedermayer 6017c98036 Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'

* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
  avutil: add AV_PIX_FMT_YA16 pixel format

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

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

2014-08-04 22:12:24 +02:00

compat

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

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

doc

Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'

2014-08-04 22:12:24 +02:00

libavcodec

Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'

2014-08-04 21:48:00 +02:00

libavdevice

avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue

2014-07-31 21:19:15 +02:00

libavfilter

Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

2014-08-04 06:11:34 +02:00

libavformat

avformat/util: change av_find_default_stream_index() to use a score based system

2014-08-04 18:06:26 +02:00

libavresample

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

libavutil

Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'

2014-08-04 22:12:24 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

2014-04-24 17:50:02 +02:00

libswresample

swresample/swresample: Treat mono as planar

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

libswscale

Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'

2014-08-04 21:48:00 +02:00

presets

presets: remove moldering iPod presets

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

tests

Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

2014-08-04 14:23:46 +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

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

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 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'

2014-08-04 14:14:13 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

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

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

2014-08-04 13:33:44 +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

ffplay: increase subtitle que size

2014-07-12 16:29:03 +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.6%

Assembly 7.5%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%