ffmpeg

Go to file

Michael Niedermayer 7b018e5c8d Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'

* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
  xl: return a meaningful error code.
  xan: return a meaningful error code.
  xxan: return meaningful error codes.
  zmbv: return more meaningful error codes.
  yop: use a meaningful error code.
  c93: return meaningful error codes.
  bmv: return meaningful error codes.
  bmp: return meaningful error codes.
  bink: operate with pointers to AVFrames instead of whole structs.
  bink: return meaningful error codes.
  bfi: return meaningful error codes.
  bethsoftvideo: return meaningful error codes.

Conflicts:
	libavcodec/c93.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/yop.c

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

2013-01-06 23:59:35 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

doc/ffmpeg-resampler: Try to document async

2013-01-06 17:47:49 +01:00

libavcodec

Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4'

2013-01-06 23:59:35 +01:00

libavdevice

Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'

2013-01-04 13:01:54 +01:00

libavfilter

lavfi/kerndeint: remove unused pixel_step.

2013-01-06 18:59:15 +01:00

libavformat

ff_get_audio_frame_size: try to fix wma in wav

2013-01-06 19:46:04 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-06 13:20:23 +01:00

libavutil

lavu: test for broken binutils on ARM

2013-01-05 16:25:37 +01:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

lswr: Improve default resampler's default parameters

2013-01-04 16:47:57 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2013-01-05 13:37:30 +01:00

presets

presets: specify the codecs.

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

tests

tests/fate/avfilter.mak: merge pp tests into GPL test list

2013-01-06 19:04:24 +01:00

tools

Fix "knwon" typo and add a check in tools/patcheck

2013-01-04 19:24:37 +00:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Changelog, update for 1.1 release

2013-01-06 21:28:15 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

cmdutils: update copyright year to 2013

2013-01-03 13:35:12 +02:00

cmdutils.h

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

lavfi: add histeq filter

2013-01-05 10:25:32 +01: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

ffmpeg_filter.c

ffmpeg: sub2video: set resample size.

2013-01-01 23:06:34 +01:00

ffmpeg_opt.c

mpegpsenc: Fix SCR handling for DVD

2013-01-04 20:58:59 +01:00

ffmpeg.c

add note on windows pipe

2013-01-06 17:47:49 +01:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

2012-12-20 02:38:02 +01:00

ffplay.c

Replace references to "que" with the appropriate word.

2013-01-03 00:21:47 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

ffserver: add missing padding to extradata.

2012-12-30 22:22:18 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01: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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%