1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 6218831844 Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
  lavf/ftp: favour EPSV over PASV command
  lavf/audiointerleave: return more meaningful error codes
  lavf/audiointerleave: check for allocation failure
  lavf/audiointerleave: use av_fifo_alloc_array
  lavf/dvenc: use av_fifo_alloc_array
  lavc/flac_parser: use av_fifo_alloc_array
  lavc/frame_thread_encoder: use av_fifo_alloc_array
  lavfi/vf_fps: use av_fifo_alloc_array
  lavfi/buffersink: use av_fifo_alloc_array
  ffmpeg: use av_fifo_alloc_array
  lavd/jack_audio: use av_fifo_alloc_array
  lavu/fifo: add av_fifo_alloc_array function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 00:22:51 +02:00
compat
doc lavu/fifo: add av_fifo_alloc_array function 2014-05-20 00:00:44 +02:00
libavcodec Merge remote-tracking branch 'lukaszmluki/master' 2014-05-20 00:22:51 +02:00
libavdevice lavd/jack_audio: use av_fifo_alloc_array 2014-05-20 00:00:44 +02:00
libavfilter lavfi/vf_fps: use av_fifo_alloc_array 2014-05-20 00:00:44 +02:00
libavformat lavf/ftp: favour EPSV over PASV command 2014-05-20 00:00:45 +02:00
libavresample
libavutil lavu/fifo: add av_fifo_alloc_array function 2014-05-20 00:00:44 +02:00
libpostproc
libswresample
libswscale
presets
tests Set dwSuggestBufferSize to largest chunk size for every stream in avi. 2014-05-19 00:05:40 +02:00
tools tools: Use av_gettime_relative() 2014-05-17 15:51:58 +02:00
.gitignore
arch.mak
Changelog Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834' 2014-05-19 19:12:30 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c
cmdutils.h cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32 2014-05-17 13:18:29 +02:00
common.mak
configure configure: make vp9 decoder select the parser. 2014-05-17 16:13:42 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: add last_mux_dts_plus_duration 2014-05-19 15:35:20 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: use av_fifo_alloc_array 2014-05-20 00:00:44 +02:00
ffmpeg.h ffmpeg: add last_mux_dts_plus_duration 2014-05-19 15:35:20 +02:00
ffplay.c ffplay: Use av_gettime_relative() 2014-05-17 20:28:16 +02:00
ffprobe.c ffprobe: fix crash happening because of new streams occuring 2014-05-18 20:04:02 +02:00
ffserver.c
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.