RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
32,894 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
eae3cf06a5
Go to file
Michael Niedermayer eae3cf06a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flvdec: Fix invalid pointer deferences when parsing index
  configure: disable hardware capabilities ELF section with suncc on Solaris x86
  Use explicit struct initializers for AVCodec declarations.
  Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
  adpcmenc: Set bits_per_coded_sample
  adpcmenc: fix QT IMA ADPCM encoder
  adpcmdec: Fix QT IMA ADPCM decoder
  permit decoding of multichannel ADPCM_EA_XAS
  Fix input buffer size check in adpcm_ea decoder.
  fft: avoid a signed overflow
  mpegps: Handle buffer exhaustion when reading packets.

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavdevice/alsa-audio-enc.c
	libavformat/flvdec.c
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 22:39:52 +02:00
doc vf_drawtext: make x and y options parametric 2011-09-24 12:36:48 +02:00
ffpresets presets: use private options in libx264-ipod ffpresets 2011-09-22 06:27:07 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
libavfilter vf_drawtext: use ctx for expressing outlink and dtext in end_frame 2011-09-24 12:37:12 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
libavutil Add new pix_fmt RGBA64 2011-09-24 06:01:45 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
libswscale Add new pix_fmt RGBA64 2011-09-24 06:01:45 +02:00
mt-work
tests adpcmenc: fix QT IMA ADPCM encoder 2011-09-23 20:54:29 -04:00
tools
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: move grow_array out of #if CONFIG_AVFILTER 2011-09-23 11:40:25 +02:00
cmdutils.h
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." 2011-09-21 14:12:00 +02:00
ffplay.c ffplay: fix order of operations for sdl audio open. 2011-09-24 03:09:54 +02:00
ffprobe.c ffprobe: remove misplaced and pointless comment. 2011-09-22 00:22:53 +02:00
ffserver.c
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: loose svn reference 2011-09-23 19:18:58 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README
RELEASE
subdir.mak
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.