1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 1e49439f04 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 21:31:51 +02:00
compat
doc Merge commit '33082af7560a18179b52734665ef66f812902d33' 2014-05-18 20:57:41 +02:00
libavcodec x86: hevc_mc: specify coefficients registers 2014-05-18 16:23:58 +02:00
libavdevice lavd: Use av_gettime_relative() 2014-05-18 16:10:12 +02:00
libavfilter avfilter/edgedetect: reuse already defined ctx. 2014-05-17 14:16:04 +02:00
libavformat Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11' 2014-05-18 21:05:46 +02:00
libavresample
libavutil lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
libpostproc
libswresample
libswscale
presets
tests Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
tools tools: Use av_gettime_relative() 2014-05-17 15:51:58 +02:00
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32 2014-05-17 13:18:29 +02:00
common.mak
configure configure: make vp9 decoder select the parser. 2014-05-17 16:13:42 +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 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' 2014-05-18 21:31:51 +02:00
ffmpeg.h
ffplay.c ffplay: Use av_gettime_relative() 2014-05-17 20:28:16 +02:00
ffprobe.c ffprobe: fix crash happening because of new streams occuring 2014-05-18 20:04:02 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.