FFmpeg

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

T

Michael Niedermayer ac021fdc40 Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

* commit '56d061ce9da954560892e3551513d5ecc0439846':
  metasound: add last missing modes (8kHz @ 6kbps per channel)

Conflicts:
	Changelog
	doc/general.texi

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

2013-11-26 12:28:31 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2013-11-24 23:27:32 +01:00

doc

Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

2013-11-26 12:28:31 +01:00

libavcodec

Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

2013-11-26 12:28:31 +01:00

libavdevice

lavd/sdl: do not manually free window_title and icon_title fields

2013-11-24 19:35:36 +01:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

libavformat

build: Integrate multilibrary examples into the build system

2013-11-25 11:57:29 -08:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

libpostproc

…

libswresample

…

libswscale

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

2013-11-23 12:10:40 +01:00

presets

…

tests

…

tools

…

.gitignore

…

arch.mak

…

Changelog

Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

2013-11-26 12:28:31 +01:00

cmdutils_common_opts.h

…

cmdutils.c

cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

2013-11-26 10:03:32 +01:00

cmdutils.h

cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

2013-11-26 10:03:32 +01:00

common.mak

…

configure

configure: define CONFIG_THIS_YEAR at the configure level

2013-11-26 09:54:40 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg.h

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffplay.c

ffplay: do not call avcodec_register_all() explicitly

2013-11-25 00:03:20 +01:00

ffprobe.c

cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

2013-11-26 10:03:32 +01:00

ffserver.c

…

INSTALL

…

library.mak

…

LICENSE

…

MAINTAINERS

…

Makefile

Makefile: Fix building progs out of progs_g

2013-11-26 02:06:41 +01:00

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.