ffmpeg

Go to file

Michael Niedermayer 4d9bde86d0 ffmpeg: dont allow -flags to override -pass

Fixes Ticket2154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ccf9dd00da055e94117b56cead4af80ff331b00e)

Conflicts:
	ffmpeg_opt.c

2013-02-06 10:23:45 +01:00

doc

Merge commit 'a335ffd7f4cdaaa6a8fe4187f6f06b0418eea19a' into release/0.10

2013-01-17 02:20:20 +01:00

ffpresets

Merge remote-tracking branch 'qatar/master'

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

libavcodec

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2013-01-17 02:33:07 +01:00

libavdevice

buildsystem: 10l add v4l entry back

2012-01-25 00:46:41 +01:00

libavfilter

vf_fade: fix memleaks of args

2012-10-25 21:12:39 +02:00

libavformat

matroskaenc: add codec_tag lists back.

2013-01-24 02:42:38 +01:00

libavutil

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2013-01-17 02:33:07 +01:00

libpostproc

pp: avoid overflow in w*h

2012-10-25 21:19:56 +02:00

libswresample

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

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

libswscale

swscale-test: fix freeing of uninitialized variable

2012-10-25 21:09:11 +02: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

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

2012-10-16 04:25:51 +02:00

tools

ffeval: avoid folding EOF onto a valid char

2012-10-25 21:19:56 +02:00

.gitignore

Merge remote-tracking branch 'qatar/master'

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

Changelog

Update Changelog

2013-01-12 17:59:41 +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-06-08 12:38:58 +02:00

cmdutils.h

Read preset files with suffix .avpreset

2012-04-29 22:07:01 +02:00

common.mak

Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10

2013-01-17 01:58:54 +01:00

configure

Fix detection of struct v4l2_frmsize_discrete.

2013-01-17 02:45:20 +01: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

Update for 0.10.6

2012-10-25 21:43:19 +02:00

ffmpeg.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 10:23:45 +01:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

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

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-25 21:09:14 +02:00

ffserver.c

ffserver: prevent nb_streams from becoming too large

2012-10-25 21:12:37 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10

2013-01-17 01:58:54 +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 commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10

2013-01-17 01:58:54 +01:00

README

Revert "partially rename FFmpeg to Libav"

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

RELEASE

Update for 0.10.6

2012-10-25 21:43:19 +02:00

VERSION

Update for 0.10.6

2012-10-25 21:43:19 +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.

Languages

C 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%