virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
38,469 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
268098d8b2
Go to file
Michael Niedermayer 268098d8b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  amrwb: remove duplicate arguments from extrapolate_isf().
  amrwb: error out early if mode is invalid.
  h264: change underread for 10bit QPEL to overread.
  matroska: check buffer size for RM-style byte reordering.
  vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
  vp8: change int stride to ptrdiff_t stride.
  wma: fix invalid buffer size assumptions causing random overreads.
  Windows Media Audio Lossless decoder
  rv10/20: Fix slice overflow with checked bitstream reader.
  h263dec: Disallow width/height changing with frame threads.
  rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
  rmdec: Honor .RMF tag size rather than assuming 18.
  g722: Fix the QMF scaling
  r3d: don't set codec timebase.
  electronicarts: set timebase for tgv video.
  electronicarts: parse the framerate for cmv video.
  ogg: don't set codec timebase
  electronicarts: don't set codec timebase
  avs: don't set codec timebase
  wavpack: Fix an integer overflow
  ...

Conflicts:
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/msmpeg4.c
	libavcodec/pnmdec.c
	libavcodec/qpeg.c
	libavcodec/rawenc.c
	libavcodec/ulti.c
	libavcodec/vcr1.c
	libavcodec/version.h
	libavcodec/wmalosslessdec.c
	libavformat/electronicarts.c
	libswscale/ppc/yuv2rgb_altivec.c
	tests/ref/acodec/g722
	tests/ref/fate/ea-cmv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-03 00:23:10 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
libavdevice timefilter: better selftest code. 2012-03-02 16:00:21 +01:00
libavfilter vf_deshake: try to fix memleak 2012-02-29 02:33:32 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
libavutil eval: fix infinite loop on opensolaris x86. 2012-03-01 03:24:45 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample Exit ffmpeg if swr_convert() fails. 2012-02-27 19:02:28 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
tools
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure libavfilter/libmpcodecs: add vf_pp from current mplayer svn 2012-02-26 20:39:32 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffplay.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.