1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer fa3a7b55ec Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'
* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
  cavs: Add a dependency on h264chroma
  lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Conflicts:
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07 00:18:22 +01:00
compat compat/strtod: isspace -> av_isspace. 2013-03-04 03:37:36 +01:00
doc lavf/concat: document the use of the files durations. 2013-03-06 16:58:38 +01:00
libavcodec Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae' 2013-03-07 00:18:22 +01:00
libavdevice v4l2: fix regression that caused ffmpeg to occasionally get stuck 2013-03-02 01:55:08 +01:00
libavfilter vf_stereo3d: Add AVOption table terminator 2013-03-05 22:29:57 +01:00
libavformat asfdec: dont truncate type 2-5 values 2013-03-05 22:29:57 +01:00
libavresample
libavutil lavu/eval: add native support to lte and lt functions 2013-03-05 15:15:45 +01:00
libpostproc
libswresample buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
libswscale
presets
tests tests: add overlay rgb and yuv444 tests 2013-03-05 13:20:13 +01:00
tools
.gitignore
arch.mak
Changelog lavfi: port MP stereo3d filter 2013-03-05 18:36:40 +00:00
cmdutils_common_opts.h
cmdutils.c Remove incorrect use of ctype.h functions. 2013-03-03 21:44:10 +01:00
cmdutils.h
common.mak
configure cavs: Add a dependency on h264chroma 2013-03-06 21:55:51 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: Ask for overwrite in single image2 files too 2013-03-03 22:09:01 +01:00
ffmpeg.c Deprecate deinterlaced in libavcodec. 2013-03-03 21:11:48 +01:00
ffmpeg.h
ffplay.c ffplay: use AVFrame accessor functions 2013-03-01 23:22:08 +01:00
ffprobe.c ffprobe: use AVFrame accessor functions 2013-03-01 23:18:22 +01:00
ffserver.c Remove incorrect use of ctype.h functions. 2013-03-03 21:44:10 +01:00
INSTALL
library.mak
LICENSE lavfi: port MP stereo3d filter 2013-03-05 18:36:40 +00:00
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.