1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 4aeafbaab8 Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
  h264_parser: Use ff_h264_reset_sei()

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:19:28 +02:00
compat
doc avplay: Accept cpuflags option 2013-10-22 10:49:31 +02:00
libavcodec Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991' 2013-10-22 19:19:28 +02:00
libavdevice lavd/pulse_audio_enc: add support for flushing 2013-10-20 19:15:30 +02:00
libavfilter lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 2013-10-22 17:05:26 +01:00
libavformat nut: Fix unchecked allocations 2013-10-22 17:08:10 +01:00
libavresample
libavutil Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux. 2013-10-21 13:49:30 +02:00
libpostproc
libswresample
libswscale
presets
tests fate: enable hevc tests 2013-10-21 14:22:41 +02:00
tools
.gitignore
arch.mak
Changelog avfilter: replaygain scanner 2013-10-21 19:56:55 +00:00
cmdutils_common_opts.h Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 2013-10-22 19:07:28 +02:00
cmdutils.c Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 2013-10-22 19:07:28 +02:00
cmdutils.h Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 2013-10-22 19:07:28 +02:00
common.mak
configure make it possible to compile ffmpeg without swscale 2013-10-21 13:57:00 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c make it possible to compile ffmpeg without swscale 2013-10-21 13:57:00 +00:00
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add lavd/fbdev_enc entry 2013-10-20 19:23:31 +02:00
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.