1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 0ed023275f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: don't touch H264Context->ref_count[] during MB decoding
  x86: get_cpu_flags: add necessary ifdefs around function body
  x86: Drop CPU detection intrinsics
  x86: Add YASM implementations of cpuid and xgetbv from x264

Conflicts:
	configure
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-05 17:04:15 +02:00
compat
doc Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
libavcodec Merge commit '65d12900432ac880d764edbbd36818431484a76e' 2012-10-05 16:52:13 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
libavfilter Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
libavformat Merge commit '65d12900432ac880d764edbbd36818431484a76e' 2012-10-05 16:52:13 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2012-10-05 17:04:15 +02:00
libpostproc
libswresample
libswscale sws: drop unused variable 2012-09-30 23:14:20 +02:00
presets
tests movenc.c: Add support for >16bit BE flavours 2012-10-04 21:31:10 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
.gitignore
arch.mak
Changelog Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-10-05 17:04:15 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
ffmpeg.c fix exit_program() prototypes 2012-10-02 21:55:31 +02:00
ffmpeg.h
ffplay.c ffplay: autodetect realtime streams and enable infbuf 2012-10-04 17:35:20 +02:00
ffprobe.c fix exit_program() prototypes 2012-10-02 21:55:31 +02:00
ffserver.c ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier. 2012-10-02 22:59:03 +02:00
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.