mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00

Go to file

Michael Niedermayer 28c0319517 Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'

* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/dsicinvideo.c

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

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

compat

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

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

doc

doc/protocols: document unit of timeouts for ftp and http

2014-07-05 12:07:11 +02:00

libavcodec

Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'

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

libavdevice

avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation

2014-07-03 13:05:58 +02:00

libavfilter

avfilter/vsrc_cellauto: Use av_mallocz_array()

2014-07-06 14:35:13 +02:00

libavformat

Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'

2014-07-06 19:25:12 +02:00

libavresample

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

2014-05-29 01:23:22 +02:00

libavutil

avutil: actually install hash.h

2014-07-06 20:45:37 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

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

libswresample

swresample: organize functions into doxy groups

2014-07-06 22:07:15 +02:00

libswscale

swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding

2014-06-22 03:09:28 +02:00

presets

presets: remove moldering iPod presets

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

tests

avcodec/roqvideo: use JPEG color range

2014-07-06 23:34:58 +02:00

tools

tools/ffeval: print computed value even in case of error

2014-07-05 11:48:24 +02:00

.gitignore

Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

2014-06-16 13:04:41 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

Changelog

avformat: Add image3 demuxers with format autodetection

2014-07-03 18:14:06 +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

Fix standalone compilation of the amv encoder.

2014-07-05 12:55:14 +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: Fix choose_pixel_fmt() so it uses the correct encoding context

2014-06-01 17:16:08 +02:00

ffmpeg_opt.c

ffmpeg_opt: route -ab to -b:a

2014-06-29 02:47:49 +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: check av_opt_set_dict() return

2014-07-02 05:53:13 +02:00

ffmpeg.h

ffmpeg: support setting AVStream.discard

2014-06-07 21:26:22 +02:00

ffplay.c

ffplay: decrease audio_diff_threshold

2014-06-24 21:59:21 +02:00

ffprobe.c

ffprobe: add color_range and color_space to stream output

2014-06-24 00:35:16 +02:00

ffserver.c

ffserver: don't leak poll_table if poll fails

2014-05-10 18:16:19 -04:00

INSTALL.md

INSTALL: add markdown syntax

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

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE.md

LICENCE: add markdown syntax

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

MAINTAINERS

avfilter: add hqx filter (hq2x, hq3x, hq4x)

2014-06-21 19:22:55 +02:00

Makefile

Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

2014-05-15 21:01:07 +02:00

README.md

README: add markdown syntax

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

RELEASE

Prepare for 11_alpha1 Release

2014-03-13 08:24:11 -04:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01: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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%