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,663 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%
bf807a5e87
Go to file
Michael Niedermayer bf807a5e87 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  sbrdsp.asm: convert all instructions to float/SSE ones.
  dv: cosmetics.
  dv: check buffer size before reading profile.
  Revert "AAC SBR: group some writes."
  udp: Print an error message if bind fails
  cook: extend channel uncoupling tables so the full bit range is covered.
  roqvideo: cosmetics.
  roqvideo: convert to bytestream2 API.
  dca: don't use av_clip_uintp2().
  wmall: fix build with -DDEBUG enabled.
  smc: port to bytestream2 API.
  AAC SBR: group some writes.
  dsputil: remove shift parameter from scalarproduct_int16
  SBR DSP: unroll sum_square
  rv34: remove dead code in intra availability check
  rv34: clean a bit availability checks.
  v4l2: update documentation
  tgq: convert to bytestream2 API.
  parser: remove forward declaration of MpegEncContext
  dca: prevent accessing static arrays with invalid indexes.
  ...

Conflicts:
	doc/indevs.texi
	libavcodec/Makefile
	libavcodec/dca.c
	libavcodec/dvdata.c
	libavcodec/eatgq.c
	libavcodec/mmvideo.c
	libavcodec/roqvideodec.c
	libavcodec/smc.c
	libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-08 02:51:45 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +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-03-08 02:51:45 +01:00
libavdevice alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
libavfilter vf_yadif: accept input with several frames available. 2012-03-07 17:36:04 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
libavutil libavutil: document av_force_cpu_flags(-1). 2012-03-08 00:39:56 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr: special case for empty channels in rematrix. 2012-03-07 23:56:00 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
Changelog libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: show fps more accurately when it is small. 2012-03-08 00:11:59 +01:00
ffplay.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
MAINTAINERS libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-04 02:34:14 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.