ffmpeg

Go to file

Michael Niedermayer 58b8d268d9 Merge commit 'aa807425395caa17a85ed2833133278e8bd44a76'

* commit 'aa807425395caa17a85ed2833133278e8bd44a76':
  configure: Support older version of openjpeg1

Conflicts:
	configure

Not merged as the problematic pkg config code wasnt merged

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

2014-03-12 21:45:02 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2014-03-10 12:05:02 +01:00

doc

update doc/APIchanges

2014-03-12 13:51:09 +01:00

libavcodec

Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'

2014-03-12 21:35:58 +01:00

libavdevice

Merge remote-tracking branch 'cigaes/master'

2014-03-08 15:00:36 +01:00

libavfilter

lavfi/af_atempo: clear references before returning error.

2014-03-08 12:31:00 +01:00

libavformat

Merge commit 'e77a2ea9505863e50bf013706f66bf8b7325e524'

2014-03-12 20:50:29 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-02-22 21:12:02 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2014-03-09 15:37:35 +01:00

libpostproc

…

libswresample

swr: check that the context for swr_convert() has been initialized

2014-02-24 08:23:42 +01:00

libswscale

libswscale: bayer to rgb24 & yv12 colorspace converters

2014-02-23 02:38:22 +01:00

presets

…

tests

Add fieldmatch test

2014-03-10 02:59:01 +01:00

tools

Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'

2014-03-01 14:44:58 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

…

Changelog

lavf: add subfile protocol.

2014-03-08 12:36:57 +01:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

…

cmdutils.c

…

cmdutils.h

…

common.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

configure

Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'

2014-03-12 21:05:00 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check

2014-02-25 00:05:37 +01:00

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: dont try to run the subtitle encoder on non subtitle streams

2014-03-03 21:06:24 +01:00

ffmpeg.h

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +01:00

ffplay.c

ffplay: display information on stream cycling

2014-03-12 00:32:38 +01:00

ffprobe.c

…

ffserver.c

ffserver: merge RTSP's teardown & pause routines

2014-02-14 14:31:42 -03:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE

…

MAINTAINERS

update for 2.2

2014-03-01 03:34:59 +01:00

Makefile

…

README

…

RELEASE

RELEASE: update for 2.2

2014-03-01 17:09:12 +01:00

version.sh

…

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.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%