1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer b9bfd888e5 Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'
* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb':
  output example: use OutputStream for audio streams as well

Conflicts:
	doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 23:01:52 +02:00
compat
doc Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb' 2014-06-26 23:01:52 +02:00
libavcodec Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443' 2014-06-26 20:56:23 +02:00
libavdevice
libavfilter avfilter/x86/vf_pullup: fix old typo 2014-06-25 18:22:48 +02:00
libavformat Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df' 2014-06-26 21:03:21 +02:00
libavresample
libavutil Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0' 2014-06-24 01:09:38 +02:00
libpostproc
libswresample
libswscale
presets
tests ffprobe: add color_range and color_space to stream output 2014-06-24 00:35:16 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765' 2014-06-23 13:31:26 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: decrease audio_diff_threshold 2014-06-24 21:59:21 +02:00
ffprobe.c ffprobe: add color_range and color_space to stream output 2014-06-24 00:35:16 +02:00
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.