FFmpeg

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

T

Michael Niedermayer 4040b56f5a Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

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

2014-02-09 02:37:17 +01:00

compat

compat: provide va_copy for old gcc versions.

2013-12-30 12:38:03 +01:00

doc

Merge remote-tracking branch 'qatar/master'

2014-02-08 19:02:46 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2014-02-09 02:37:17 +01:00

libavdevice

lavd/sdl: reset context variables after destroy

2014-02-08 12:27:00 +01:00

libavfilter

Fix a few heigth/height typo.

2014-02-07 09:33:56 +01:00

libavformat

Merge remote-tracking branch 'qatar/master'

2014-02-08 19:02:46 +01:00

libavresample

Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'

2014-02-08 18:38:17 +01:00

libavutil

Merge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635'

2014-02-08 00:49:28 +01:00

libpostproc

…

libswresample

swresample: Add arm&x86 clobber tests

2014-01-18 18:38:57 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2014-01-21 22:20:26 +01:00

presets

…

tests

Merge remote-tracking branch 'qatar/master'

2014-02-06 00:35:05 +01:00

tools

Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'

2014-01-17 14:38:33 +01:00

.gitignore

examples: add avio_reading.c example

2014-02-02 11:58:23 +01:00

arch.mak

…

Changelog

Merge remote-tracking branch 'qatar/master'

2014-02-08 19:02:46 +01:00

cmdutils_common_opts.h

Allow hiding the banner.

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

cmdutils_opencl.c

…

cmdutils.c

cmdutils: update copyright year to 2014.

2014-01-05 22:39:35 +02:00

cmdutils.h

Allow hiding the banner.

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

common.mak

…

configure

Merge remote-tracking branch 'qatar/master'

2014-02-08 19:02:46 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used

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

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: tweak debug_ts logging and add more of it

2014-02-02 13:11:52 +01:00

ffmpeg.h

ffmpeg: change ost->finished to an enum

2014-01-17 23:57:02 +01:00

ffplay.c

ffplay: flush subtitle codecs as well with null packets

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

ffprobe.c

ffprobe: check av_frame_alloc() failure.

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

ffserver.c

ffserver: drop unneeded delay1 var

2014-02-08 00:30:29 -03:00

INSTALL

…

library.mak

…

LICENSE

Change license of yadif from GPL to LGPL

2014-01-14 14:19:15 +01:00

MAINTAINERS

MAINTAINERS: add myself as opengl_enc.c maintainer

2014-01-28 15:30:49 +01:00

Makefile

…

README

…

RELEASE

Prepare for 10_alpha2 Release

2014-01-18 10:27:27 -05: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.