Go to file
Michael Niedermayer ac293b6685 Merge commit '194be1f43ea391eb986732707435176e579265aa'
* commit '194be1f43ea391eb986732707435176e579265aa':
  lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:
	doc/APIchanges
	libavformat/filmstripenc.c
	libavformat/movenc.c
	libavformat/mxfenc.c
	libavformat/oggenc.c
	libavformat/swf.h
	libavformat/version.h
	tests/ref/lavf/mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 19:49:17 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc Merge commit '194be1f43ea391eb986732707435176e579265aa' 2014-06-18 19:49:17 +02:00
libavcodec avcodec/ass: move playres parameters below scripttype 2014-06-18 18:43:36 +02:00
libavdevice lavd/avfoundation: Support user selected pixel formats and pixel format autoselection. 2014-06-12 21:31:25 +02:00
libavfilter avfilter/vf_spp: Use av_malloc_array() 2014-06-18 00:07:30 +02:00
libavformat Merge commit '194be1f43ea391eb986732707435176e579265aa' 2014-06-18 19:49:17 +02:00
libavresample Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil Merge commit '44671b57866aab8dd36715ff010e985e25baaf19' 2014-06-18 12:53:42 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swr: remove div/mod from DSP functions. 2014-06-18 14:15:52 +02:00
libswscale swscale/swscale: replace potentially slow % by & 2014-06-18 04:24:31 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests Merge commit '194be1f43ea391eb986732707435176e579265aa' 2014-06-18 19:49:17 +02:00
tools tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB 2014-06-10 04:00:06 +02:00
.gitignore Remove avserver. 2014-06-18 14:55:28 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Remove avserver. 2014-06-18 14:55:28 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c version string: add copyright line to version string 2014-06-16 10:24:28 -08:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure Remove avserver. 2014-06-18 14:55:28 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
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 Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c Merge commit '71d6551e674c86d07c165439c2bf6613b3892307' 2014-06-17 12:58:16 +02:00
ffmpeg.h ffmpeg: support setting AVStream.discard 2014-06-07 21:26:22 +02:00
ffplay.c ffplay: remove -ec handling code 2014-06-17 17:31:29 +02:00
ffprobe.c ffprobe: add rc_max_rate to stream output 2014-06-09 23:19:33 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS MAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1* 2014-06-15 16:24:39 +02:00
Makefile Remove avserver. 2014-06-18 14:55:28 +02:00
README.md README: add markdown syntax 2014-05-28 22:38:11 +02:00
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

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.