1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer fcb5849a62 Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'
* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
  build: add avresample after avcodec to FFLIBS

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 21:01:07 +02:00
compat
doc doc: Add udp broadcast option description 2014-05-15 20:52:42 +02:00
libavcodec avcodec/options: avcodec_copy_context() Check subtitle_header_size instead of setting it 2014-05-15 19:41:38 +02:00
libavdevice Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavfilter avfilter/vsrc_mandelbrot: use av_malloc_array() 2014-05-15 01:54:36 +02:00
libavformat Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf' 2014-05-15 19:24:19 +02:00
libavresample Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavutil avutil/dict: delay addition of const from e12a73246d until next major ABI bump 2014-05-14 15:44:01 +02:00
libpostproc
libswresample swresample: swr_close() 2014-05-15 18:27:23 +02:00
libswscale swscale/utils: Add check that ensures that the hardcoded struct offsets are valid 2014-05-14 01:32:11 +02:00
presets
tests Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
tools tools/ismindex: use av_mallocz_array() 2014-05-05 18:47:24 +02:00
.gitignore gitignore: add tools/uncoded_frame 2014-05-06 14:14:32 +02:00
arch.mak
Changelog Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222' 2014-05-15 18:20:17 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h cmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCL 2014-05-07 06:14:57 +02:00
common.mak Merge commit '7e90133f6420b1c53652f972b9561600822881ee' 2014-05-14 14:02:19 +02:00
configure avcodec/opusdec: switch to swresample 2014-05-15 18:28:45 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c Merge commit '9580818c5d934bde65a95efd2cee61c174721092' 2014-05-05 15:51:55 +02:00
ffmpeg_opt.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: use av_fifo_freep 2014-05-07 23:39:47 +02:00
ffmpeg.h Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffplay.c
ffprobe.c
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file 2014-05-04 18:57:15 +02:00
Makefile Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f' 2014-05-15 21:01:07 +02:00
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.