ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-06 03:23:16 +00:00

T

Michael Niedermayer a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

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

2013-11-01 10:46:39 +01:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

2013-08-28 12:46:12 +02:00

doc

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

libavcodec

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

libavdevice

timefilter: Handle memory allocation failure

2013-10-29 11:40:04 +00:00

libavfilter

Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'

2013-11-01 10:26:49 +01:00

libavformat

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

libavresample

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

2013-10-28 09:59:53 +01:00

libavutil

avutil/opt: fix flags check on non x86

2013-10-29 21:07:45 +01:00

libpostproc

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

2013-06-16 18:21:39 +02:00

libswresample

lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT

2013-10-17 18:09:54 +02:00

libswscale

Optimize pure C unscaled yuv2rgb.

2013-10-30 20:52:24 +01:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

tests/fate: fix fate on branches different from origin/master

2013-10-29 21:53:59 +01:00

tools

Merge remote-tracking branch 'qatar/master'

2013-10-05 11:35:39 +02:00

.gitignore

tools: add benchmark for crypto functions.

2013-09-04 16:36:11 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

cmdutils_common_opts.h

cmdutils: add -colors option

2013-10-27 09:18:45 +01:00

cmdutils.c

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

cmdutils.h

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

common.mak

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

2013-10-04 11:49:01 +02:00

configure

Merge commit 'e78913052263af80855590659fb0f705e8f13c8a'

2013-10-29 19:50:03 +01:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

ffmpeg_filter: Fix non jpeg yuv in jpeg support

2013-10-27 17:41:06 +01:00

ffmpeg_opt.c

make it possible to compile ffmpeg without swscale

2013-10-21 13:57:00 +00:00

ffmpeg.c

Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

2013-10-29 21:38:53 +01:00

ffmpeg.h

Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

2013-10-29 21:38:53 +01:00

ffplay.c

ffplay: add support for libswresample options

2013-10-26 12:23:54 +02:00

ffprobe.c

ffprobe: fix consistency checks in parse_read_intervals()

2013-10-21 13:33:06 +02:00

ffserver.c

ffserver: strip odd chars from html error messages before sending them back

2013-10-09 00:30:46 +02:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

build: remove pointless condition

2013-10-29 14:00:29 +00:00

LICENSE

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00:00

MAINTAINERS

MAINTAINERS: add myself as libzvbi-teletextdec maintainer

2013-10-31 21:31:52 +01:00

Makefile

build: Ensure that strip commands are run silently

2013-10-31 11:48:59 +01:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Update for 2.0

2013-07-10 02:15:43 +02:00

version.sh

version.sh: handle shallow clones and snapshots.

2011-07-22 10:43:59 +02: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.