wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
36535 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer 3edff185ab Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  ipmovie: do not read audio packets before the codec is known
  truemotion2: check size before GetBitContext initialisation
  avio: Only do implicit network initialization for network protocols
  avio: Add an URLProtocol flag for indicating that a protocol uses network
  adpcm: ADPCM Electronic Arts has always two channels
  matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
  fate: Add missing reference file from 9b4767e4.
  mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
  4xm: Prevent buffer overreads.
  mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
  vp3: add fate test for non-zero last coefficient
  vp3: fix streams with non-zero last coefficient
  swscale: remove unused U/V arguments from yuv2rgb_write().
  timer: K&R formatting cosmetics
  lavf: cosmetics, reformat av_read_frame().
  lavf: refactor av_read_frame() to make it easier to understand.
  Report an error if pitch_lag is zero in AMR-NB decoder.
  Revert "4xm: Prevent buffer overreads."
  4xm: Prevent buffer overreads.
  4xm: pass the correct remaining buffer size to decode_i2_frame().
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/mjpegdec.c
	libavcodec/truemotion2.c
	libavformat/ipmovie.c
	libavformat/mov_chan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-06 02:45:12 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libavfilter volume: remove duplicated condition. 2012-01-05 21:53:18 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libswresample swr: fix swresample_version() 2011-12-23 23:26:02 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-03 03:06:45 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
Changelog mov: support timecode extraction. 2012-01-05 20:59:52 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +01:00
cmdutils.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
ffmpeg.c ffmpeg: check if number of input and output channels are valid. 2012-01-06 02:05:50 +01:00
ffplay.c ffplay: fix invalid wanted_channel_layout calculation 2012-01-05 20:04:23 +01:00
ffprobe.c ffprobe: add support to option -show_error 2012-01-04 01:06:28 +01:00
ffserver.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: update release maintainers 2012-01-02 16:01:33 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: We're now at 0.9.0.git 2011-12-16 15:20:13 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.