FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-13 19:12:36 +00:00

Go to file

Michael Niedermayer 4e04e1b81e Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: convert yuv2yuvX() to using named arguments.
  swscale: rename "dstw" to "w" to prevent name collisions.
  swscale: use named registers in yuv2yuv1_plane() place.
  lavf: fix aspect ratio mismatch message.
  avconv: set AVFormatContext.duration from '-t'
  cljr: implement encode2.
  cljr: set the properties of the coded_frame, not input frame.
  dnxhdenc: switch to encode2.
  bmpenc: switch to encode2().

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/cljr.c
	libavformat/utils.c
	tests/ref/vsynth1/cljr
	tests/ref/vsynth2/cljr

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

2012-02-13 02:06:44 +01:00

doc

Merge remote-tracking branch 'qatar/master'

2012-02-10 01:20:07 +01:00

ffpresets

Merge remote-tracking branch 'qatar/master'

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

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-02-13 02:06:44 +01:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2012-02-11 01:22:22 +01:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-02-10 01:20:07 +01:00

libavformat

Fix aspect ratio mismatch message

2012-02-12 20:24:29 +01:00

libavutil

Detect and check for CMOV.

2012-02-12 18:56:06 +01:00

libpostproc

build: Allow building old API/ABI libpostproc version

2012-01-24 17:01:10 +01:00

libswresample

libswresample: introduce int swr_set_compensation() instead of void swr_compensate()

2012-01-09 04:16:06 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-02-13 02:06:44 +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

cljr: set the properties of the coded_frame, not input frame.

2012-02-12 08:05:38 +01:00

tools

Fix "ouput" typo and add a check.

2012-01-28 11:04:19 +01:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-01-26 02:23:56 +01:00

Changelog

lavfi: add setfield filter

2012-02-06 20:46:58 +01:00

cmdutils_common_opts.h

ff*: add -max_alloc command line option

2011-12-25 18:55:43 +01:00

cmdutils.c

cmdutils: update copyright year to 2012.

2012-02-08 10:31:14 -08:00

cmdutils.h

Drop unnecessary prefix from *sink* variable and struct names.

2012-01-25 12:28:36 +01:00

common.mak

Add coverage support.

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

configure

Add missing swscale dependency for MP-filters.

2012-02-10 17:39:36 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

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

COPYING.LGPLv3

…

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

Merge remote-tracking branch 'qatar/master'

2012-02-13 02:06:44 +01:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2012-02-07 01:40:29 +01:00

ffprobe.c

ffprobe: fix typo in ESCAPE_CHECK_SIZE

2012-02-06 11:30:45 +01:00

ffserver.c

ffserver: use avcodec_get_context_defaults3()

2012-02-07 05:51:31 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2011-12-18 03:04:44 +01:00

LICENSE

libaac+ support

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

MAINTAINERS

maintainers: add myself for recent works.

2012-01-24 16:07:53 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-02-04 02:34:14 +01:00

README

cosmetics: fix dashed line length after 070c5d0

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

RELEASE

Merge remote-tracking branch 'qatar/master'

2012-01-21 23:11:27 +01: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.

Languages

C 89%

Assembly 8.4%

Makefile 1.4%

GLSL 0.4%

C++ 0.3%

Other 0.2%