ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-11 12:19:29 +00:00

T

Michael Niedermayer 32da2fd422 Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
	libavcodec/nuv.c

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

2014-03-22 21:58:04 +01:00

compat

Merge remote-tracking branch 'qatar/master'

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

doc

udp: try to clarify verbiage on buffer_size

2014-03-22 16:46:06 +01:00

libavcodec

Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

2014-03-22 21:58:04 +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

avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough

2014-03-22 16:40:46 +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: add swri_resample_float_sse

2014-03-20 06:01:06 +01:00

libswscale

Add APIchanges entry and bump libswscale micro version for making gray16 full-scale.

2014-03-19 09:11:22 +01:00

presets

…

tests

fate: add cine demux test

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

tools

tools/build_libstagefright: switch git urls to https

2014-03-12 23:07:00 +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

Changelog: move post 2.2 branching entries out of the 2.2 changelog

2014-03-16 19:15:58 +01:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

…

cmdutils.c

avconv: Match stream id

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

cmdutils.h

…

common.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

configure

configure: Try to fix detection of ARM Compiler 5.04

2014-03-21 17:51:16 +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: dont call exit_program() from a signal hander

2014-03-21 17:09:56 +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

…

ffserver.c

…

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

…

MAINTAINERS

MAINTAINERS: add myself az mpegts demuxer maintainer

2014-03-18 02:05:44 +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

…

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.