1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer e13d5e9a4b Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 11:59:20 +01:00
compat
doc Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 2012-11-14 11:59:20 +01:00
libavcodec Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 2012-11-14 11:59:20 +01:00
libavdevice Update iec61883 to handle multiple devices, and allow 2012-11-13 19:44:21 +01:00
libavfilter lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths 2012-11-13 22:54:29 +01:00
libavformat Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 2012-11-14 11:59:20 +01:00
libavresample
libavutil Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 2012-11-14 11:59:20 +01:00
libpostproc
libswresample Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
libswscale
presets
tests remove tests/asynth1.sw 2012-11-13 10:36:25 +01:00
tools Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 2012-11-13 13:21:21 +00:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c pixdesc: add av_pix_fmt_get_chroma_sub_sample 2012-11-13 16:14:55 +01:00
cmdutils.h
common.mak
configure Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b' 2012-11-13 10:55:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: fix double ;; 2012-11-14 02:06:50 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: fix NULL dereference with quoted Stream name. 2012-11-14 10:09:57 +01:00
INSTALL
library.mak
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.