ffmpeg

x/ffmpeg

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

T

Michael Niedermayer 9c6e23f5d2 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fft: fix imdct_half() for AVX
  rtmppkt: Add missing libavcodec/bytestream.h include.
  rtmp: add functions for reading AMF values
  vc1dec: remove useless #include simple_idct.h
  dct-test: always link with aandcttab.o
  vp8: pack struct VP8ThreadData more efficiently
  x86: remove libmpeg2 mmx(ext) idct functions
  eamad: Use dsputils instead of a custom bswap16_buf
  Canopus Lossless decoder

Conflicts:
	Changelog
	LICENSE
	libavcodec/avcodec.h
	libavcodec/cllc.c
	libavcodec/eamad.c
	libavcodec/version.h

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

2012-08-02 23:34:01 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-07-12 23:57:00 +02:00

doc

Canopus Lossless decoder

2012-08-01 22:06:16 -04:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-08-02 23:34:01 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-07-31 22:41:00 +02:00

libavfilter

lavfi/rgbtestsrc: use ff_fill_rgba_map() rather than a local copy

2012-08-02 12:32:48 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-08-02 23:34:01 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-07-27 23:42:19 +02:00

libavutil

timecode: show frame rate when invalid.

2012-08-01 17:36:37 +02:00

libpostproc

pp: check that the argument is not NULL as this is not supported

2012-07-07 19:14:21 +02:00

libswresample

swr: fix 10l typo mixing in and out config.

2012-08-01 21:18:03 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-07-30 23:28:31 +02:00

mt-work

Update todo

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

presets

presets: specify the codecs.

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

tests

tiny_psnr: fix undefined shift

2012-08-01 20:00:01 +02:00

tools

tools/bisect-create: Support "bisect run"

2012-07-24 01:24:23 +02:00

.gitignore

tools/bisect: rename temporary file and add it to git ignore

2012-07-07 13:15:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

Changelog

Canopus Lossless decoder

2012-08-01 22:06:16 -04:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

cmdutils/alloc_buffer: fix typo

2012-07-20 16:42:29 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-07-04 00:32:31 +02:00

common.mak

buildsys: fix c++ compilation

2012-07-30 17:51:33 +02:00

configure

configure: reduce difference to qatar by 2 lines

2012-08-02 00:41:16 +02: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

Revert "partially rename FFmpeg to Libav"

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

Doxyfile

remove avconv from Doxyfile

2012-01-25 22:47:45 +01:00

ffmpeg.c

ffmpeg: honor -ss and -t parameters with muxed subtitles.

2012-08-01 20:37:34 +02:00

ffplay.c

ffplay: fix warning that i just mistakenly introduced

2012-07-20 03:47:11 +02:00

ffprobe.c

ffprobe: fix validity error with tags and data.

2012-07-31 15:06:57 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-06-20 20:47:46 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

LICENSE

x86: remove libmpeg2 mmx(ext) idct functions

2012-08-02 12:14:52 +01:00

MAINTAINERS

Canopus Lossless decoder

2012-08-01 22:02:19 -04:00

Makefile

build: support non-standard replacements for -c flag

2012-07-28 01:50:12 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update, seem this has been forgotten

2012-07-01 21:21:07 +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.