RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
43,101 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
d1dad7c824
Go to file
Michael Niedermayer d1dad7c824 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpc8: return more meaningful error codes.
  mpc: return more meaningful error codes.
  wv,mpc8: don't return apetag data in packets.
  rtmp: do not warn about receiving metadata packets
  x86: h264dsp: Adjust YASM #ifdefs
  x86: yadif: Mark mmxext optimizations as such
  h264: convert loop filter strength dsp function to yasm.
  Improve descriptiveness of a number of codec and container long names

Conflicts:
	libavcodec/flvdec.c
	libavcodec/libopenjpegdec.c
	libavformat/apetag.c
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-31 22:41:00 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
doc ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
libavutil lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values 2012-07-31 13:15:43 +02:00
libpostproc pp: check that the argument is not NULL as this is not supported 2012-07-07 19:14:21 +02:00
libswresample swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
tools tools/bisect-create: Support "bisect run" 2012-07-24 01:24:23 +02:00
.gitignore tools/bisect: rename temporary file and add it to git ignore 2012-07-07 13:15:01 +02:00
arch.mak
Changelog lavfi: add flite audio source 2012-07-28 11:06:43 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils/alloc_buffer: fix typo 2012-07-20 16:42:29 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
common.mak buildsys: fix c++ compilation 2012-07-30 17:51:33 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: init simple filter graph before trying to extract framerate from its output. 2012-07-30 14:17:10 +02:00
ffplay.c ffplay: fix warning that i just mistakenly introduced 2012-07-20 03:47:11 +02:00
ffprobe.c ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
LICENSE
MAINTAINERS FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
Makefile build: use COMPILE template for HOSTOBJS 2012-07-26 23:58:59 +01:00
README
RELEASE RELEASE: update, seem this has been forgotten 2012-07-01 21:21:07 +02:00
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.