ffmpeg

Go to file

Michael Niedermayer 4abb88d7e8 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_hqdn3d: Don't declare the loop variable within the for loop
  huffyuv: update to current coding style
  huffman: update to current coding style
  rtsp: Free the rtpdec context properly
  build: fft: x86: Drop unused YASM-OBJS-FFT- variable

Conflicts:
	libavcodec/huffman.c
	libavcodec/huffyuv.c
	libavcodec/x86/Makefile
	libavfilter/vf_hqdn3d.c

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

2012-08-27 16:32:44 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-08-17 17:06:52 +02:00

doc

examples/decoding_encoding: make operation logic more self-evident / predictable

2012-08-27 10:09:48 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-08-27 16:32:44 +02:00

libavdevice

dshow:protect access to curbufsize to promote consistency

2012-08-20 20:58:05 +02:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2012-08-27 16:32:44 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-08-27 16:32:44 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-08-24 15:00:39 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-08-26 22:40:02 +02:00

libpostproc

rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT

2012-08-20 17:47:25 +02:00

libswresample

Merge remote-tracking branch 'qatar/master'

2012-08-24 15:00:39 +02:00

libswscale

rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT

2012-08-20 17:47:25 +02:00

mt-work

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-08-26 22:40:02 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

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

Changelog

matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.

2012-08-25 13:15:41 -07:00

cmdutils_common_opts.h

Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

2012-08-20 17:06:50 +02:00

cmdutils.c

Fix one of the problems with -codecs, -encoders and -decoders.

2012-08-25 08:49:23 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

common.mak

checkheaders: Rename HEADEROBJS to HOBJS

2012-08-09 05:02:45 +02:00

configure

huffman/huffyuv: move lorens huffman table generation code to huffman.c/h

2012-08-22 16:52:07 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

Merge remote-tracking branch 'qatar/master'

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

ffmpeg_filter.c

ffmpeg: make decoding_needed a counter.

2012-08-22 19:04:30 +02:00

ffmpeg_opt.c

Merge remote-tracking branch 'qatar/master'

2012-08-26 02:34:24 +02:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2012-08-26 22:40:02 +02:00

ffmpeg.h

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

ffplay.c

ffplay: fix odd YUV width by cropping the video

2012-08-27 01:44:57 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2012-08-20 17:31:55 +02:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-08-09 00:51:02 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

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

MAINTAINERS

Canopus Lossless decoder

2012-08-01 22:02:19 -04:00

Makefile

build: Fix compilation when configuring with a prog suffix

2012-08-27 01:32:13 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update, seem this has been forgotten

2012-07-01 21:21:07 +02: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%