virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
39,623 Commits 37 Branches 400 Tags 473 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6101e5322f
Go to file
Michael Niedermayer 6101e5322f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
  asfdec: Add an option for not searching for the packet markers
  cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
  cosmetics: Align codec declarations
  cosmetics: Convert mimic.c to utf-8
  avconv: remove an unused function parameter.
  avconv: remove now pointless variables.
  avconv: drop support for building without libavfilter.
  nellymoserenc: fix crash due to memsetting the wrong area.
  libavformat: Only require first packet to be known for audio/video streams
  avplay: Don't try to scale timestamps if the tb isn't set

Conflicts:
	Changelog
	configure
	ffmpeg.c
	libavcodec/aacenc.c
	libavcodec/bmpenc.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/ffv1.c
	libavcodec/flacenc.c
	libavcodec/fraps.c
	libavcodec/huffyuv.c
	libavcodec/libopenjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/pamenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngenc.c
	libavcodec/qtrleenc.c
	libavcodec/rawdec.c
	libavcodec/sgienc.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.c
	libavcodec/wmv2dec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-07 22:41:37 +02:00
doc doc/muxers: add documentation for the md5 and framemd5 muxers 2012-04-07 13:57:40 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
libavfilter lavfi/mp: remove remove_logo wrapper 2012-04-07 13:57:39 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
libpostproc
libswresample swr-test: remove unused variable 2012-04-01 22:24:06 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-04-05 22:26:50 +02:00
mt-work
presets
tests Do not decode the mp3 data in lavf test since that is not bit-exact. 2012-04-07 16:35:28 +02:00
tools
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
ffprobe.c
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE
version.sh

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.