1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 2a5f4c1ea2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  wtv: Seek by sector properly

Conflicts:
	libavformat/wtvdec.c

See: a0d13d84a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 11:11:34 +02:00
compat
doc lavd/pulse_audio_dec: apply cosmetic changes 2013-10-18 23:26:55 +02:00
libavcodec avcodec: Add little-endian G726 decoder 2013-10-18 16:46:08 +02:00
libavdevice lavd/pulse_audio_enc: fix error check 2013-10-18 23:59:27 +02:00
libavfilter
libavformat Merge remote-tracking branch 'qatar/master' 2013-10-19 11:11:34 +02:00
libavresample
libavutil lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions 2013-10-17 18:09:29 +02:00
libpostproc
libswresample lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 2013-10-17 18:09:54 +02:00
libswscale swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast 2013-10-17 14:02:43 +02:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-10-17 20:15:22 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: remove \r from cc_ident, 2013-10-19 00:15:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add Timothy to documentation 2013-10-19 00:49:54 +02:00
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.