1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer ac26d7ea9d Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
  doc: Document mpegts muxrate

Conflicts:
	doc/muxers.texi

See: 5b76c3a120
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 23:25:46 +02:00
compat
doc Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55' 2014-06-10 23:25:46 +02:00
libavcodec Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478' 2014-06-10 18:35:49 +02:00
libavdevice avdevice/lavfi: Use av_malloc_array() 2014-06-07 15:04:50 +02:00
libavfilter avfilter/vf_zoompan: fix mixing of declarations and statements 2014-06-09 17:27:34 +02:00
libavformat Merge remote-tracking branch 'cehoyos/master' 2014-06-10 18:22:41 +02:00
libavresample
libavutil Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772' 2014-06-09 17:25:09 +02:00
libpostproc
libswresample swr: handle 64bit overflow check in multiple_resample(). 2014-06-09 15:24:51 +02:00
libswscale x86/scale: fix xmm register count for hscale*_sse2 2014-06-09 04:13:23 +02:00
presets
tests tests: add a third, 34x34, target 2014-06-10 20:24:49 +02:00
tools tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB 2014-06-10 04:00:06 +02:00
.gitignore
arch.mak
Changelog Zoom & Pan filter 2014-06-09 12:41:33 +00:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '7b06ddb8352fe7f434414d7911ced94956bb25b2' 2014-06-09 16:48:08 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffmpeg_opt.c ffmpeg: support setting AVStream.discard 2014-06-07 21:26:22 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy 2014-06-05 18:37:32 +02:00
ffmpeg.h ffmpeg: support setting AVStream.discard 2014-06-07 21:26:22 +02:00
ffplay.c
ffprobe.c ffprobe: add rc_max_rate to stream output 2014-06-09 23:19:33 +02:00
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS avfilter: new multimedia filter avf_showcqt.c 2014-06-05 14:04:01 +02:00
Makefile
README.md
RELEASE
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.