FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00

Go to file

Michael Niedermayer 81ff0c24ef Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
  configure: fix libcdio check
  rtsp: Allow setting the reordering buffer size via an AVOption
  rtsp: Vertically align a constant definition
  rtp: Update the check for distinguishing between RTP and RTCP
  aac: fix build with hardcoded tables
  fate: dependencies for screen codec tests
  riff: Move functions around to be covered by appropriate #ifdefs

Conflicts:
	configure
	tests/fate/screen.mak

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

2012-10-19 13:58:14 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-10-14 15:11:34 +02:00

doc

examples/muxing: merge add_audio_stream() and add_video_stream()

2012-10-17 21:39:13 +02:00

libavcodec

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

2012-10-19 13:58:14 +02:00

libavdevice

caca: fix 10l typo

2012-10-12 19:05:58 +02:00

libavfilter

lavfi/avf_concat: fix invalid exclusive test.

2012-10-17 21:28:58 +02:00

libavformat

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

2012-10-19 13:58:14 +02:00

libavresample

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

2012-10-14 14:46:13 +02:00

libavutil

Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'

2012-10-19 13:29:24 +02:00

libpostproc

pp: avoid overflow in w*h

2012-10-13 21:17:43 +02:00

libswresample

swr-test: fix division by 0

2012-10-16 19:40:57 +02:00

libswscale

sws-test: parse command line args before initing contexts

2012-10-17 11:56:36 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

2012-10-19 13:58:14 +02:00

tools

tools/ffeval: do not use UNIX-specific /dev/std{in,out} files

2012-10-16 13:51:44 +02:00

.gitignore

gitignore: add *.dylib for those of us on Darwin/OS X systems.

2012-10-16 04:14:09 +02:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

2012-10-19 13:47:47 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

cmdutils: add missing check for ftell() return

2012-10-18 00:10:59 +02:00

cmdutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

configure

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

2012-10-19 13:58:14 +02:00

COPYING.GPLv2

…

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

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams

2012-10-16 01:04:42 +02:00

ffmpeg_opt.c

Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

2012-10-17 14:30:25 +02:00

ffmpeg.c

ffmpeg: Make video filter graph reinit user selectable

2012-10-17 00:06:12 +02:00

ffmpeg.h

ffmpeg: Make video filter graph reinit user selectable

2012-10-17 00:06:12 +02:00

ffplay.c

ffplay: Prevent 0/0 aspect from being passed on to lavfi

2012-10-14 23:40:14 +02:00

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-11 03:37:43 +02:00

ffserver.c

ffm_read_write_index: check lseek return code

2012-10-17 20:35:16 +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-10-11 15:55:41 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

add dshow maintainer

2012-10-12 19:52:05 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-16 14:15:16 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

prepare 9_beta1 release

2012-10-11 18:36:40 +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.

Languages

C 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%