FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00

T

Michael Niedermayer 3bf189bb00 Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'

* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
  avconv: always reset packet pts after decoding an audio frame

Conflicts:
	ffmpeg.c

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

2014-04-22 13:45:34 +02:00

compat

…

doc

Merge remote-tracking branch 'lukaszmluki/master'

2014-04-20 05:43:26 +02:00

libavcodec

Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'

2014-04-22 13:34:43 +02:00

libavdevice

lavd/xv: implement repaint message

2014-04-19 02:18:45 +02:00

libavfilter

avfilter/pthread: Use av_mallocz_array()

2014-04-22 02:40:20 +02:00

libavformat

Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'

2014-04-22 13:30:23 +02:00

libavresample

Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'

2014-04-17 21:07:25 +02:00

libavutil

avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO

2014-04-22 02:09:55 +02:00

libpostproc

…

libswresample

swresample/resample_template: try to consider src_size more exactly

2014-04-15 06:35:35 +02:00

libswscale

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00

presets

…

tests

txd: do not set the codec timebase.

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

tools

…

.gitignore

…

arch.mak

…

Changelog

Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

2014-04-19 19:26:46 +02:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

…

cmdutils.c

…

cmdutils.h

…

common.mak

…

configure

Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'

2014-04-21 20:20:39 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

…

ffmpeg_vdpau.c

…

ffmpeg.c

Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'

2014-04-22 13:45:34 +02:00

ffmpeg.h

…

ffplay.c

avformat: add av_format_inject_global_side_data(), and disable it by default

2014-04-15 02:37:40 +02:00

ffprobe.c

…

ffserver.c

…

INSTALL

…

library.mak

…

LICENSE

…

MAINTAINERS

MAINTAINERS: Add myself as FIC maintainer

2014-04-21 21:27:32 -04:00

Makefile

…

README

…

RELEASE

…

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.