1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer bcd5fd5346 Merge commit 'lukaszmluki/master^'
* commit 'lukaszmluki/master^':
  lavd/pulse_audio_enc: implement get_device_list callback
  lavd/pulse_audio_dec: implement get_device_list callback
  lavd/pulse_audio_common: add device detecting code
  lavu/mem: add av_dynarray_add_nofree function
  lavd/pulse_audio_enc: implement write_uncoded_frame callback
  tools/uncoded_frame: fix audio codec generation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29 17:07:26 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc lavu/mem: add av_dynarray_add_nofree function 2014-03-29 09:48:48 +01:00
libavcodec avcodec/vp7: check buffer size 2014-03-29 04:27:00 +01:00
libavdevice lavd/pulse_audio_enc: implement get_device_list callback 2014-03-29 09:54:16 +01:00
libavfilter avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream 2014-03-28 17:29:26 +01:00
libavformat avformat/movenc: fix if vs if else 2014-03-29 15:38:20 +01:00
libavresample Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 2014-03-26 14:50:55 +01:00
libavutil lavu/mem: add av_dynarray_add_nofree function 2014-03-29 09:48:48 +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 Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 2014-03-26 14:50:55 +01:00
presets
tests fate/aliaspix: Use standard test sample 2014-03-28 12:55:54 +01:00
tools tools/uncoded_frame: fix audio codec generation 2014-03-29 09:25:14 +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 '678082b409aca711f9cf991df6b0200116489322' 2014-03-28 05:26:24 +01:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 2013-12-09 21:21:36 +01:00
cmdutils.c cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE 2014-03-28 17:29:26 +01:00
cmdutils.h Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 2014-03-29 14:33:39 +01:00
common.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
configure configure: fix VP7 standalone build 2014-03-27 04:23:59 +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 'aa499568afc01d59215eef7e5b14b949a9671afc' 2014-03-25 19:25:10 +01:00
ffmpeg.h Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 2014-03-24 16:40:35 +01:00
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c ffprobe: check av_frame_alloc() failure. 2013-12-30 10:58:01 +01:00
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 Add libx265 encoder 2014-02-12 13:12:22 +00:00
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 version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.