Go to file
Michael Niedermayer 9c52ab6f4f ffmpeg: treat avi as VFR in framerate conversion code
It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 00:09:32 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc doc/muxers: document animated GIF muxer. 2013-11-07 20:30:43 +01:00
libavcodec Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45' 2013-11-08 23:37:14 +01:00
libavdevice lavd/pulse: add ff_ prefix and fix param type 2013-11-04 00:47:00 +01:00
libavfilter avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter() 2013-11-07 23:38:44 +01:00
libavformat avformat/mxfdec: optimize probing 2013-11-08 22:33:52 +01:00
libavresample
libavutil avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++ 2013-11-05 22:10:02 +01:00
libpostproc
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale lsws/utils: introduce scale_algorithms array 2013-11-05 14:01:53 +01:00
presets
tests
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak
Changelog Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' 2013-11-03 11:54:19 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6' 2013-11-08 17:42:56 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: add verbose consistency checks in case of filtering inconsistent options 2013-11-03 18:05:43 +01:00
ffmpeg.c ffmpeg: treat avi as VFR in framerate conversion code 2013-11-09 00:09:32 +01:00
ffmpeg.h
ffplay.c ffplay: add smarter method for determining video picture duration 2013-11-05 21:27:07 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add vp9 maintainers 2013-11-03 14:45:18 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-11-04 01:20:46 +01:00
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.