ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-07 06:18:43 +00:00

T

Michael Niedermayer 3ba0bfe71f Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

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

2011-12-13 23:21:37 +01:00

doc

decoding example: reset pts/dts after subpacket.

2011-12-13 19:47:57 +01:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libswresample

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

presets

Remove redundant libx264 preset files

2011-10-22 01:32:10 +02:00

tests

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

tools

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

.gitignore

gitignore: add libswresample*

2011-09-19 17:39:38 +02:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

Changelog

lavfi: add cellauto source

2011-12-11 11:55:33 +01:00

cmdutils_common_opts.h

fftools: add -report option.

2011-12-10 16:40:03 +01:00

cmdutils.c

fftools: add -report option.

2011-12-10 16:40:03 +01:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

common.mak

Add coverage support.

2011-12-05 20:04:48 +01:00

configure

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +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

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

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

COPYING.LGPLv3

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

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

CREDITS

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

Doxyfile

Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X

2011-12-11 03:00:30 +01:00

ffmpeg.c

ffmpeg: reset dts/pts after decoding the first subpacket

2011-12-13 19:46:29 +01:00

ffplay.c

cleanup: for(int

2011-12-13 21:08:43 +01:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

libaac+ support

2011-09-26 02:28:21 +02:00

MAINTAINERS

MAINTAINERS: extend syntax for entries

2011-12-11 03:05:37 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-12-13 23:21:37 +01:00

README

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

RELEASE

RELEASE: We're now at 0.8.7.git

2011-11-25 14:37:35 +01:00

subdir.mak

Add rule for compiling to asm

2011-10-22 20:49:24 +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.

2) Licensing
------------

* See the LICENSE file.