Go to file
Michael Niedermayer e3c1d9a56c Merge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'
* commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011':
  mux: drop one of the hacks comprising compute_pkt_fields2()

Conflicts:
	libavformat/mux.c

Not merged as -async drop / -vsync drop depends on this code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 18:27:56 +02:00
compat
doc Merge commit '33082af7560a18179b52734665ef66f812902d33' 2014-05-18 20:57:41 +02:00
libavcodec avcodec/libvorbisenc: do not attempt to flush if no data was input 2014-05-19 17:37:50 +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 avformat/mpegtsenc: fix dts for chained muxing aac in mpegts 2014-05-19 16:30:46 +02:00
libavresample
libavutil lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
libpostproc
libswresample
libswscale
presets
tests Set dwSuggestBufferSize to largest chunk size for every stream in avi. 2014-05-19 00:05:40 +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 ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
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: add last_mux_dts_plus_duration 2014-05-19 15:35:20 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: set dts for subtitles 2014-05-19 16:07:50 +02:00
ffmpeg.h ffmpeg: add last_mux_dts_plus_duration 2014-05-19 15:35:20 +02:00
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.