mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer afa7ab557a Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'

* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
  Use av_packet_rescale_ts() to simplify code.

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c

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

2014-06-20 17:03:58 +02:00

compat

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

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

doc

Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'

2014-06-20 17:03:58 +02:00

libavcodec

Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'

2014-06-20 16:40:04 +02:00

libavdevice

lavd/avfoundation: Support user selected pixel formats and pixel format autoselection.

2014-06-12 21:31:25 +02:00

libavfilter

avfilter/vf_spp: Use av_malloc_array()

2014-06-18 00:07:30 +02:00

libavformat

avformat/utils: better probing for duration in estimate_timings_from_pts()

2014-06-19 20:48:46 +02:00

libavresample

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

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

libavutil

Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c'

2014-06-19 23:47:10 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

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

libswresample

swr: remove div/mod from DSP functions.

2014-06-18 14:15:52 +02:00

libswscale

s86/scale: Do not return the result of a (void) function from a void function.

2014-06-19 18:45:13 +02:00

presets

presets: remove moldering iPod presets

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

tests

tests/fate.sh: report different status for different errors

2014-06-20 05:33:51 +02:00

tools

tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB

2014-06-10 04:00:06 +02:00

.gitignore

Remove avserver.

2014-06-18 14:55:28 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

Changelog

Remove avserver.

2014-06-18 14:55:28 +02:00

cmdutils_common_opts.h

ffmpeg: add -devices param

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

cmdutils_opencl.c

ffmpeg: Use av_gettime_relative()

2014-05-19 02:35:07 +02:00

cmdutils.c

version string: add copyright line to version string

2014-06-16 10:24:28 -08: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

configure: remove superfluous check for AVX/FMA3 support in Yasm

2014-06-20 15:53:58 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

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: Dont exit on avformat_find_stream_info() failure if there are streams

2014-06-18 21:35:54 +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

Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'

2014-06-20 17:03:58 +02:00

ffmpeg.h

ffmpeg: support setting AVStream.discard

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

ffplay.c

ffplay: remove -ec handling code

2014-06-17 17:31:29 +02:00

ffprobe.c

ffprobe: add rc_max_rate to stream output

2014-06-09 23:19:33 +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

MAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1*

2014-06-15 16:24:39 +02:00

Makefile

Remove avserver.

2014-06-18 14:55:28 +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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%