FFmpeg git repo
Go to file
Michael Niedermayer 1c66807636 Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
* commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112':
  configure: support Bitrig OS
  yuv2rgb: handle line widths that are not a multiple of 4.
  graph2dot: Use the fallback getopt implementation if needed
  tools: Include io.h for open/read/write/close if unistd.h doesn't exist
  testprogs: Remove unused includes
  qt-faststart: Use other seek/tell functions on MSVC than on mingw
  ismindex: Include direct.h for _mkdir on windows
  sdp: Use static const char arrays instead of pointers to strings
  x86: avcodec: Drop silly "_mmx" suffixes from filenames
  x86: avcodec: Drop silly "_sse" suffixes from filenames
  sdp: Include profile-level-id for H264
  utvideoenc: use ff_huff_gen_len_table
  huffman: add ff_huff_gen_len_table
  cllc: simplify/fix swapped data buffer allocation.
  rtpdec_h264: Don't set the pixel format
  h264: Check that the codec isn't null before accessing it
  audio_frame_queue: Define af_queue_log_state before using it

Conflicts:
	libavcodec/audio_frame_queue.c
	libavcodec/h264.c
	libavcodec/huffman.h
	libavcodec/huffyuv.c
	libavcodec/utvideoenc.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-29 18:04:34 +02:00
compat lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime. 2012-08-28 17:52:03 +02:00
doc Add 'timeout' option to UDP protocol 2012-08-29 00:28:07 +02:00
libavcodec Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
libavdevice dshow:protect access to curbufsize to promote consistency 2012-08-20 20:58:05 +02:00
libavfilter lavfi: add smartblur filter 2012-08-28 19:48:16 +02:00
libavformat Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
libavutil lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime. 2012-08-28 17:52:03 +02:00
libpostproc rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT 2012-08-20 17:47:25 +02:00
libswresample Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
libswscale Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mt-work Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
presets
tests utvideoenc: use ff_huff_gen_len_table 2012-08-28 17:43:25 +02:00
tools Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
.gitignore gitignore: add scaling_video example. 2012-08-28 20:35:04 +02:00
arch.mak
Changelog lavfi: add smartblur filter 2012-08-28 19:48:16 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.c cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
cmdutils.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
configure Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg_filter.c ffmpeg: make decoding_needed a counter. 2012-08-22 19:04:30 +02:00
ffmpeg_opt.c Merge remote-tracking branch 'qatar/master' 2012-08-26 02:34:24 +02:00
ffmpeg.c ffmpeg: count finished streams for last stats line. 2012-08-28 23:19:33 +02:00
ffmpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
ffplay.c ffplay: fix odd YUV width by cropping the video 2012-08-27 01:44:57 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS add myself as vda decoder maintainer 2012-08-28 18:01:22 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +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.