ffmpeg

x/ffmpeg

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

T

Michael Niedermayer 052f4f859c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a':
  lavfi: remove 'opaque' parameter from AVFilter.init()
  mov: do not try to read total disc/track number if data atom is too short.
  avconv: fix -force_key_frames
  dxva2_h264: fix signaling of mbaff frames
  x86: fft: elf64: fix PIC build

Conflicts:
	ffmpeg.c
	libavcodec/v210dec.h
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_overlay.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c

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

2012-06-26 23:57:07 +02:00

doc

examples/filtering: fix packet memleak

2012-06-26 19:04:17 +02:00

libavcodec

x86: fft: elf64: fix PIC build

2012-06-26 15:57:32 +02:00

libavdevice

lavfi: remove old video sink API

2012-06-26 11:40:08 +02:00

libavfilter

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

libavformat

mov: do not try to read total disc/track number if data atom is too short.

2012-06-26 13:12:50 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-06-26 01:13:07 +02:00

libavutil

lavu/imgutils: create misc functions for dealing with buffers

2012-06-26 13:12:12 +02:00

libpostproc

postprocess: fix another void returning void function.

2012-06-10 18:26:16 +02:00

libswresample

swresample: make .class_name more descriptive

2012-06-22 14:01:15 +00:00

libswscale

swscale: use designated initializers for AVClass

2012-06-22 02:34:34 +00: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

vocenc: use new header from codec tag 4

2012-06-25 03:45:29 +02:00

tools

tools/graph2dot: make dot graph representation a bit more compact

2012-06-26 11:34:38 +02:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

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

Changelog

Merge remote-tracking branch 'qatar/master'

2012-06-24 02:09:53 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

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

cmdutils.c

codec_release_buffer: fix handling of non user buffers

2012-06-22 23:53:24 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-05-05 20:22:09 +02:00

configure

configure: fix libavutil.pc generation

2012-06-24 20:11:11 +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

Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

2012-06-26 23:57:07 +02:00

ffplay.c

ffplay: add configure_filtergraph() helper

2012-06-26 11:42:51 +02:00

ffprobe.c

ffprobe: dump AVPacket.convergence_duration.

2012-06-18 09:39:17 +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-03-26 20:52:52 +02:00

LICENSE

Remove libpostproc.

2012-02-23 19:36:16 +01:00

MAINTAINERS

MAINTAINERS: reorganize entries in the libavfilter section

2012-06-17 22:17:44 +02:00

Makefile

Optimization of AMR NB and WB decoders for MIPS

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

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: bump to current version (0.10.2).

2012-03-26 22:47:28 +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.