ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00

Go to file

Michael Niedermayer 30aa9b727d Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
	libavformat/rtsp.c

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

2013-12-12 19:37:46 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2013-11-24 23:27:32 +01:00

doc

Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'

2013-12-12 00:32:15 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2013-12-12 13:02:20 +01:00

libavdevice

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

2013-12-09 20:52:14 +01:00

libavfilter

avfilter/aeval: Fix use of uninitialized variable

2013-12-11 15:31:32 +01:00

libavformat

Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

2013-12-12 19:37:46 +01:00

libavresample

avresample: Include libavutil/avutil.h in version.h

2013-12-06 22:13:20 +01:00

libavutil

Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

2013-12-12 19:12:33 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

2013-12-11 22:28:42 +01:00

libswresample

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

libswscale

swscale/utils: fill xyz tables only when they will be used

2013-12-07 02:04:31 +01:00

presets

…

tests

lavf/mux: Don't write "encoder" metadata tag when bitexact is requested

2013-12-06 19:33:41 +01:00

tools

tools/probetest: Check av_realloc() return code

2013-12-11 22:29:22 +01:00

.gitignore

Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

2013-12-01 21:18:11 +01:00

arch.mak

…

Changelog

Merge commit '7e244c68600f479270e979258e389ed5240885fb'

2013-12-09 21:33:51 +01:00

cmdutils_common_opts.h

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils_opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.h

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

common.mak

common.mak: Less ugly version of the previous windres fix

2013-12-09 02:47:55 +01:00

configure

Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'

2013-12-11 22:52:28 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

Merge remote-tracking branch 'qatar/master'

2013-12-04 04:30:46 +01:00

ffmpeg_vdpau.c

…

ffmpeg.c

Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

2013-12-11 23:36:10 +01:00

ffmpeg.h

…

ffplay.c

Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

2013-12-11 23:49:44 +01:00

ffprobe.c

ffprobe: free shared writer context on exit

2013-12-03 21:27:14 +01:00

ffserver.c

ffserver: print error code description in case of write_header() failure

2013-11-30 14:35:33 +01:00

INSTALL

…

library.mak

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

LICENSE

…

MAINTAINERS

…

Makefile

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

README

…

RELEASE

RELEASE: update to 2.1.git

2013-11-29 16:41:42 +01:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01: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 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%