FFmpeg git repo
Go to file
Michael Niedermayer 46a35959d8 Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'
* commit '7751e4693dd10ec98c20fbd9887233b575034272':
  ogg: check that the expected number of headers had been parsed
  libx264: change default to closed gop to match x264cli
  Use avcodec_free_frame() to free AVFrames.
  lavf: use a malloced AVFrame in try_decode_frame().
  lavc: add avcodec_free_frame().
  lavc: ensure extended_data is set properly on decoding
  lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
  lavc: use av_mallocz to allocate AVFrames.
  lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/src_movie.c
	libavformat/oggdec.c
	libavformat/oggdec.h
	libavformat/oggparsetheora.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25 15:15:16 +02:00
compat compat/vsnprintf: return number of bytes required on truncation. 2012-09-15 19:46:54 -04:00
doc Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
libavcodec Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
libavdevice lavd/lavfi: push frames until the last sink is EOF 2012-09-20 12:13:17 +02:00
libavfilter Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
libavformat Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
libavutil ppc/cpu: make linux 32bit specific altivec detection depend on __linux__ 2012-09-24 13:41:48 +02:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample ARM: libswresample: NEON optimised generic fltp to s16 conversion 2012-09-24 23:19:32 +02:00
libswscale swscale: change assert() to av_assert() 2012-09-18 05:19:11 +02:00
presets
tests fate: fix --disable-ffprobe 2012-09-24 18:20:57 +02:00
tools Fix two "skiping" typo. 2012-09-25 07:42:32 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: sort codec lists. 2012-09-23 21:05:29 +02:00
cmdutils.h Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure configure: enable runtime cpu detect by default. 2012-09-24 13:17:29 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
ffmpeg_opt.c ffmpeg: fix 10l (use of uninitilaized variable) 2012-09-22 22:09:41 +02:00
ffmpeg.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
ffmpeg.h ffmpeg: use PTS from the AVSubtitle structure. 2012-09-15 16:14:33 +02:00
ffplay.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
ffprobe.c ffprobe: drop pointless opaque parameter in writer init callback 2012-09-25 11:02:52 +02:00
ffserver.c ffserver: fix typo in log message 2012-09-18 21:11:06 -05:00
INSTALL
library.mak Merge commit '581281e242609a222233a2e5538b89dfb88fb18e' 2012-09-20 03:20:29 +02:00
LICENSE
MAINTAINERS
Makefile Makefile: remove old codec_names.h on distclean 2012-09-07 14:59:01 +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.