FFmpeg git repo
Go to file
Michael Niedermayer fadf845973 Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'
* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

Conflicts:
	libavformat/asf.c
	libavformat/asfdec.c
	libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 14:25:28 +01:00
compat
doc doc/filters: apply various rendering changes to the showspectrum docs 2013-02-05 00:12:55 +01:00
libavcodec Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 2013-02-06 14:25:28 +01:00
libavdevice lavd/alsa: simplify reordering functions definition. 2013-02-02 14:13:11 +01:00
libavfilter libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream 2013-02-05 15:54:39 +01:00
libavformat Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 2013-02-06 14:25:28 +01:00
libavresample
libavutil lavu/parseutils: add digital cinema frame sizes 2013-02-03 22:57:04 +01:00
libpostproc
libswresample swr: Dont use floats for S32->S32 when possible 2013-02-04 04:11:46 +01:00
libswscale sws: Fix "warning: comparison of distinct pointer types lacks a cast" 2013-02-04 14:34:13 +01:00
presets
tests
tools
.gitignore
arch.mak
Changelog lavfi/showspectrum: display multiple channels in separate row 2013-02-04 13:37:43 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 2013-02-06 13:27:24 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 01:26:26 +01:00
ffmpeg.c ffmpeg: do not call exit from exit_program() 2013-02-06 04:03:52 +01:00
ffmpeg.h
ffplay.c ffplay: report video frame changes only in debug mode 2013-02-06 00:20:37 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak build: Remove superfluous MAKE variable for the build suffix 2013-02-03 13:08:36 +01:00
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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.