FFmpeg git repo
Go to file
Michael Niedermayer 6fbddc80d6 Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
	cmdutils.c
	libavcodec/libschroedinger.c
	libavcodec/libschroedingerenc.c
	libavcodec/vorbisenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26 12:50:34 +01:00
compat
doc lavfi/geq: improve support for formats with alpha plane 2013-02-25 12:54:40 +00:00
libavcodec Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655' 2013-02-26 12:50:34 +01:00
libavdevice
libavfilter lavfi/hflip: support more formats 2013-02-25 13:07:29 +00:00
libavformat pmpdec: make i unsigned, avoid undefined behavior of i++ 2013-02-25 18:36:21 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil
libpostproc
libswresample swr: make the default of nopts for first_pts actually work 2013-02-25 04:39:26 +01:00
libswscale
presets
tests fate: update pixfmts_hflip 2013-02-25 13:16:44 +00:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655' 2013-02-26 12:50:34 +01:00
cmdutils.h ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
cmdutils_common_opts.h
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d' 2013-02-26 12:39:26 +01:00
ffmpeg.c ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
ffmpeg.h ffmpeg: Force a first_pts of 0 for the first configuration of -async use 2013-02-25 04:39:26 +01:00
ffmpeg_filter.c ffmpeg: Force a first_pts of 0 for the first configuration of -async use 2013-02-25 04:39:26 +01:00
ffmpeg_opt.c ffmpeg_opt: cosmetics 2013-02-25 18:36:21 +01:00
ffplay.c ffplay: reindent and remove pointless cast in audio_decode_frame() code 2013-02-24 23:29:42 +01:00
ffprobe.c
ffserver.c
library.mak
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.