FFmpeg git repo
Go to file
Michael Niedermayer a53a107a2f Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
  movenc: Add option to disable nero chapters

Conflicts:
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:58:10 +02:00
compat
doc Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c' 2014-08-05 13:58:10 +02:00
libavcodec Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c' 2014-08-05 13:37:07 +02:00
libavdevice lavd/avfoundation: Add device category. 2014-08-05 01:36:26 +02:00
libavfilter Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 2014-08-04 06:11:34 +02:00
libavformat Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c' 2014-08-05 13:58:10 +02:00
libavresample Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' 2014-08-04 02:49:48 +02:00
libavutil Fix compile error on bfin. 2014-08-05 01:54:47 +02:00
libpostproc
libswresample swresample/swresample: Treat mono as planar 2014-08-04 03:05:05 +02:00
libswscale swscale/swscale_internal: fix ya16 -> rgba 2014-08-05 01:51:11 +02:00
presets
tests Merge commit 'eee813eec7d3c0b0689f80665d3f796401742935' 2014-08-05 01:20:20 +02:00
tools
.gitignore
arch.mak
Changelog libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed' 2014-08-05 13:00:41 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg.h ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffplay.c
ffprobe.c
ffserver.c ffserver: initialize pbuffer in prepare_sdp_description() 2014-08-02 18:32:37 +02:00
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE
RELEASE_NOTES
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.