1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer afa442c198 Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'
* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 16:30:29 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15' 2014-03-24 15:04:47 +01:00
libavcodec libx265: Only use one memcpy for headers 2014-03-24 15:28:20 +00:00
libavdevice dshow: use distinct buffers per stream. 2014-03-22 03:46:10 +01:00
libavfilter Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab' 2014-03-24 15:32:48 +01:00
libavformat Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7' 2014-03-24 15:11:08 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5' 2014-03-24 14:51:44 +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/resample: sse float linear interpolation 2014-03-24 02:34:02 +01:00
libswscale swscale/swscale: fix integer overflow 2014-03-24 05:01:32 +01:00
presets
tests fate: add tests for linearly interpolated resampling 2014-03-24 04:25:44 +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 Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7' 2014-03-24 15:11:08 +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 Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
configure Merge remote-tracking branch 'qatar/master' 2014-03-24 06:09:31 +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 Merge commit 'a220b07b0f971f88213aef012aea51af2800be62' 2014-03-24 16:30:29 +01:00
ffmpeg.h Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2' 2014-03-24 16:11:13 +01:00
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c
ffserver.c ffserver: merge RTSP's teardown & pause routines 2014-02-14 14:31:42 -03:00
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
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.