1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer afa7ab557a Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
  Use av_packet_rescale_ts() to simplify code.

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 17:03:58 +02:00
compat
doc Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251' 2014-06-20 17:03:58 +02:00
libavcodec Merge commit '874390e163427c1fe7682ab27924a7843780dbb3' 2014-06-20 16:40:04 +02:00
libavdevice
libavfilter
libavformat avformat/utils: better probing for duration in estimate_timings_from_pts() 2014-06-19 20:48:46 +02:00
libavresample
libavutil Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c' 2014-06-19 23:47:10 +02:00
libpostproc
libswresample swr: remove div/mod from DSP functions. 2014-06-18 14:15:52 +02:00
libswscale s86/scale: Do not return the result of a (void) function from a void function. 2014-06-19 18:45:13 +02:00
presets
tests tests/fate.sh: report different status for different errors 2014-06-20 05:33:51 +02:00
tools
.gitignore Remove avserver. 2014-06-18 14:55:28 +02:00
arch.mak
Changelog Remove avserver. 2014-06-18 14:55:28 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure configure: remove superfluous check for AVX/FMA3 support in Yasm 2014-06-20 15:53:58 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are streams 2014-06-18 21:35:54 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251' 2014-06-20 17:03:58 +02:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile Remove avserver. 2014-06-18 14:55:28 +02:00
README.md
RELEASE
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.