1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +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
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
libavutil lavu/mem: add av_dynarray_add_nofree function 2014-03-29 09:48:48 +01:00
libpostproc
libswresample
libswscale
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
arch.mak
Changelog Merge commit '678082b409aca711f9cf991df6b0200116489322' 2014-03-28 05:26:24 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
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
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_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
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.