1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer 0dd4eff588 Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'
* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
  build: h264 parser depends on full h264 decoder

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 00:20:56 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc lavf/concatdec: allow to match streams by id. 2014-03-23 19:15:07 +01:00
libavcodec Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d' 2014-03-24 00:20:56 +01:00
libavdevice dshow: use distinct buffers per stream. 2014-03-22 03:46:10 +01:00
libavfilter Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da' 2014-03-22 18:21:10 +01:00
libavformat lavf/concatdec: allow to match streams by id. 2014-03-23 19:15:07 +01:00
libavresample
libavutil avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD 2014-03-22 21:47:38 +01:00
libpostproc Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported. 2014-03-18 23:39:30 +01:00
libswresample swresample: add swri_resample_float_sse 2014-03-20 06:01:06 +01:00
libswscale Add APIchanges entry and bump libswscale micro version for making gray16 full-scale. 2014-03-19 09:11:22 +01:00
presets
tests fate: add cine demux test 2014-03-22 17:50:02 +01:00
tools tools: add dvd2concat. 2014-03-23 19:15:07 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
Changelog Autodetect VDA like all other hardware acccelerations. 2014-03-23 17:47:28 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c avconv: Match stream id 2014-03-13 11:59:34 +01:00
cmdutils.h
common.mak
configure Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d' 2014-03-24 00:20:56 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: sub2video: send a last blank frame before closing. 2014-03-23 19:16:35 +01:00
ffmpeg.h
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS lavu: add myself as dynarray.h maintainer. 2014-03-23 19:17:20 +01:00
Makefile Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
README
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
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.