videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-15 03:23:32 +02:00
Code Releases Activity
36,493 Commits 36 Branches 398 Tags 245 MiB
C 90.2%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
7f83db3124
Go to file
Michael Niedermayer 7f83db3124 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (46 commits)
  mtv: Make sure audio_subsegments is not 0
  v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined
  avconv: add symbolic names for -vsync parameters
  flvdec: Fix compiler warning for uninitialized variables
  rtsp: Fix compiler warning for uninitialized variable
  ulti: convert to new bytestream API.
  swscale: Use standard multiple inclusion guards in ppc/ header files.
  Place some START_TIMER invocations in separate blocks.
  v4l2: list available formats
  v4l2: set the proper codec_tag
  v4l2: refactor device_open
  v4l2: simplify away io_method
  v4l2: cosmetics
  v4l2: uniform and format options
  v4l2: do not force interlaced mode
  avio: exit early in fill_buffer without read_packet
  vc1dec: fix invalid memory access for small video dimensions
  rv34: fix invalid memory access for small video dimensions
  rv34: joint coefficient decoding and dequantization
  avplay: Don't call avio_set_interrupt_cb(NULL)
  ...

Conflicts:
	Changelog
	avconv.c
	doc/APIchanges
	doc/indevs.texi
	libavcodec/adxenc.c
	libavcodec/dnxhdenc.c
	libavcodec/h264.c
	libavdevice/v4l2.c
	libavformat/flvdec.c
	libavformat/mtv.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-05 02:03: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-05 02:03:12 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libavfilter drawtext: fix hard dependency to lavc (timecode). 2012-01-02 15:33:56 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +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-05 02:03: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-05 02:03: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 Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +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
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 Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-02 03:10:30 +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 Prepare for 0.8_beta1 snapshot release 2011-12-23 15:38:15 +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.