FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00

Go to file

Michael Niedermayer bd34e26b27 Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

2014-03-24 13:27:33 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2014-03-10 12:05:02 +01:00

doc

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

2014-03-24 13:27:33 +01:00

libavcodec

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

2014-03-24 13:27:33 +01:00

libavdevice

dshow: use distinct buffers per stream.

2014-03-22 03:46:10 +01:00

libavfilter

Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

2014-03-22 18:21:10 +01:00

libavformat

Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

2014-03-24 05:28:07 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-02-22 21:12:02 +01:00

libavutil

avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD

2014-03-22 21:47:38 +01:00

libpostproc

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

libswresample

swresample/resample: sse float linear interpolation

2014-03-24 02:34:02 +01:00

libswscale

swscale/swscale: fix integer overflow

2014-03-24 05:01:32 +01:00

presets

…

tests

fate: add tests for linearly interpolated resampling

2014-03-24 04:25:44 +01:00

tools

tools: add dvd2concat.

2014-03-23 19:15:07 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

2014-03-13 22:35:47 +01:00

Changelog

Autodetect VDA like all other hardware acccelerations.

2014-03-23 17:47:28 +01:00

cmdutils_common_opts.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

cmdutils_opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.c

avconv: Match stream id

2014-03-13 11:59:34 +01:00

cmdutils.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

common.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

configure

Merge remote-tracking branch 'qatar/master'

2014-03-24 06:09:31 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams

2014-03-16 15:15:02 +01:00

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: sub2video: send a last blank frame before closing.

2014-03-23 19:16:35 +01:00

ffmpeg.h

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +01:00

ffplay.c

ffplay: display information on stream cycling

2014-03-12 00:32:38 +01:00

ffprobe.c

ffprobe: check av_frame_alloc() failure.

2013-12-30 10:58:01 +01:00

ffserver.c

ffserver: merge RTSP's teardown & pause routines

2014-02-14 14:31:42 -03:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

Add libx265 encoder

2014-02-12 13:12:22 +00:00

MAINTAINERS

lavu: add myself as dynarray.h maintainer.

2014-03-23 19:17:20 +01:00

Makefile

Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

2014-03-13 22:35:47 +01:00

README

…

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

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.

Languages

C 89.7%

Assembly 8.2%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%