ffmpeg

x/ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-04 10:33:19 +00:00

T

Michael Niedermayer 64160ef392 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
	libavcodec/arm/ac3dsp_armv6.S

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

2011-08-04 01:40:29 +02:00

doc

Fix -loop_input.

2011-08-03 11:45:33 +02:00

ffpresets

Remove libx264 baseline ffpreset

2011-07-28 01:44:57 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-08-04 01:40:29 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2011-08-01 00:35:57 +02:00

libavfilter

vf_boxblur: call avfilter_draw_slice() at the end of draw_slice()

2011-08-03 11:18:15 +02:00

libavformat

avidec: skip seek pos adjustment for non interleaved files.

2011-08-04 01:33:40 +02:00

libavutil

audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK

2011-07-28 10:04:09 +02:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2011-07-06 23:57:11 +02:00

libswscale

lsws: remove deprecated and unused stuff after the 0->1 major bump

2011-08-04 00:23:00 +02:00

mt-work

Update todo

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

tests

Merge remote-tracking branch 'qatar/master'

2011-08-02 22:12:18 +02:00

tools

lavfi-showfiltfmts: extend output format for specifying audio data

2011-07-28 10:04:09 +02:00

.gitignore

Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'

2011-07-14 02:24:10 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2011-07-23 16:47:10 +02:00

cmdutils_common_opts.h

Make all option parsing functions match the function pointer type through which they are called.

2011-06-30 11:49:48 -04:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2011-07-29 01:50:53 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-07-29 01:50:53 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2011-07-21 16:28:53 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2011-07-27 10:40:34 +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

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

Merge remote-tracking branch 'qatar/master'

2011-07-14 20:44:58 +02:00

ffmpeg.c

Fix -loop_input.

2011-08-03 11:45:33 +02:00

ffplay.c

Unbreak ffplay -s and ffplay -pix_fmt.

2011-08-01 00:58:49 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2011-07-22 12:08:52 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

MAINTAINERS

MAINTAINERS: add a "Releases" section

2011-06-24 11:15:26 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-07-21 16:28:53 +02:00

README

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

RELEASE

RELEASE: We are git after 0.8 release

2011-07-12 01:46:21 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-31 00:34:47 +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.