No description
Find a file
Michael Niedermayer 5460ab73d2 Merge commit '1839fafa95'
* commit '1839fafa95':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +02:00
compat
doc Merge commit '1839fafa95' 2014-05-12 02:44:28 +02:00
libavcodec avcodec/vda_h264: fix null pointer dereference 2014-05-12 02:25:58 +02:00
libavdevice
libavfilter libmpcodecs/vf_uspp: check avcodec_open() return code 2014-05-11 02:13:28 +02:00
libavformat avformat/mpegtsenc: fix minor typo in omit_video_pes_length description 2014-05-11 03:20:00 +02:00
libavresample
libavutil Merge commit '66e6c8a7b4' 2014-05-12 00:37:12 +02:00
libpostproc
libswresample
libswscale
presets
tests
tools
.gitignore
arch.mak
Changelog
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak
configure Merge commit '67afcefb35' 2014-05-12 01:57:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg.c ffmpeg: use av_fifo_freep 2014-05-07 23:39:47 +02:00
ffmpeg.h Merge commit '1839fafa95' 2014-05-12 02:44:28 +02:00
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c Merge commit '1839fafa95' 2014-05-12 02:44:28 +02:00
ffmpeg_vda.c Merge commit '1839fafa95' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c
ffplay.c
ffprobe.c
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit '1839fafa95' 2014-05-12 02:44:28 +02: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.