wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
46703 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer 799d749c77 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (24 commits)
  yop: set channel layout
  wtv: set channel layout for mpeg audio
  westwood_aud: set channel layout
  wc3movie: set channel layout
  tmv: set channel layout
  tiertexseq: set channel layout
  swfdec: set channel layout
  sol: set channel layout
  smacker: set channel layout
  siff: set channel layout
  sierravmd: set channel layout
  rtpdec_amr: set channel layout
  rsodec: set channel layout
  rmdec: set channel layout for RA version 3
  qcp: set channel layout
  psxstr: set channel layout
  omadec: set channel layout
  oggparsespeex: validate channel count and set channel layout
  nuv: set channel layout
  mxg: set channel layout
  ...

Conflicts:
	libavformat/swfdec.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13 11:09:38 +01:00
compat Merge commit '0c03cc6838' 2012-10-24 13:42:58 +02:00
doc Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
libavcodec Merge commit 'ef1b23ad21' 2012-11-13 10:55:07 +01:00
libavdevice Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
libavfilter Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-11-13 11:09:38 +01:00
libavresample Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
libavutil Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample lswr/swresample: adopt globally consistent rules for options help message 2012-11-03 20:38:02 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-11-10 12:44:39 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests remove tests/asynth1.sw 2012-11-13 10:36:25 +01:00
tools probetest: fix possible use of uninitialized data 2012-10-31 13:16:52 +01:00
.gitignore .gitignore: ignore *.3 files as well 2012-11-06 12:24:12 +01:00
arch.mak Merge commit 'ca411fc1d3' 2012-10-13 15:25:11 +02:00
Changelog lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
cmdutils.c PRINT_CODEC_SUPPORTED: fix used variable 2012-11-09 03:08:29 +01:00
cmdutils.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
cmdutils_common_opts.h Revert "cmdutils: allow specifying the file for -report" 2012-11-04 10:47:52 +01:00
common.mak Merge commit '04581c8c77' 2012-10-31 13:57:09 +01:00
configure Merge commit 'ef1b23ad21' 2012-11-13 10:55:07 +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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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
ffmpeg.c Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffmpeg_filter.c Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
ffmpeg_opt.c Merge commit '97bf7c03b1' 2012-11-12 11:32:11 +01:00
ffplay.c ffplay: adjust external clock speed based on buffer fullness for realtime sources 2012-11-04 18:29:49 +01:00
ffprobe.c ffprobe: fix potential NULL pointer dereference 2012-11-06 22:59:24 +01:00
ffserver.c ffserver: zero dest_addr 2012-11-04 13:00:20 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-11-03 14:48:51 +01:00
LICENSE lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
MAINTAINERS MAINTAINERS: fix entry for img2 2012-11-06 01:46:21 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-26 15:20:48 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Merge commit 'ceb754d041' 2012-10-24 14:01:36 +02: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 in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.