1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Go to file
Michael Niedermayer 7609d42d0f Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'
* commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8':
  vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

Conflicts:
	libavcodec/mpeg12.c

Nothing changes as the buggy code is not in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:07:48 +01:00
compat
doc doc: "av* tools" -> "ff* tools". 2013-03-27 01:44:20 +01:00
libavcodec mlpdec: Fix reading state with 0 bit elements. 2013-03-28 04:01:34 +01:00
libavdevice dshow_pin: dont return a value from a void function 2013-03-25 22:12:07 +01:00
libavfilter vsrc_mandelbrot: Mandel morphing support 2013-03-27 19:27:37 +01:00
libavformat estimate_timings_from_bit_rate: Check timebase and bitrate 2013-03-28 01:45:01 +01:00
libavresample
libavutil avutil/buffer: remove redundant memory poisoning 2013-03-24 02:21:42 +01:00
libpostproc libpostproc: silence valgrind/fate warning about using uninitialized data 2013-03-25 21:48:45 +01:00
libswresample
libswscale
presets
tests tests/tiny_ssim: include the 2 macros instead of a header 2013-03-27 01:38:18 +01:00
tools tools: add audio normalize script example. 2013-03-26 01:50:13 +01:00
.gitignore tools: add tiny_ssim 2013-03-26 17:31:41 +01:00
arch.mak
Changelog Changelog: add WebP 2013-03-22 23:19:07 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd767e2f969933b4e450ed4e69ea2bf8ca864838c' 2013-03-28 10:54:17 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection 2013-03-21 13:54:04 +01:00
ffmpeg_opt.c ffmpeg_opt: avoid strcpy() 2013-03-26 01:51:19 +01:00
ffmpeg.c Call do_video_stats when duplicating frame 2013-03-23 12:29:12 +01:00
ffmpeg.h ffmpeg: Correct inter stream timestamp discontinuities 2013-03-23 04:53:44 +01:00
ffplay.c ffplay: avoid frame data leak on early frame drop 2013-03-23 02:25:33 +01:00
ffprobe.c
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS Update MAINTAINERS with information about avisynth demuxer. 2013-03-27 03:47:56 +01:00
Makefile tools: add tiny_ssim 2013-03-26 17:31:41 +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.