ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 14:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,532 Commits 36 Branches 398 Tags 536 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6190446745
Go to file
Michael Niedermayer 6190446745 Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355' 
* commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355':
  avs: return meaningful error codes.
  aura: return meaningful error codes.
  asvdec: return meaningful error codes.
  ansi: return a meaningful error code
  anm: return meaningful error codes
  aasc: return meaningful error codes.
  8bps: return meaningful error codes.
  4xm: operate with pointers to AVFrames instead of whole structs.
  4xm: eliminate a pointless indirection

Conflicts:
	libavcodec/4xm.c
	libavcodec/aasc.c
	libavcodec/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 23:48:48 +01:00
compat
doc doc/ffmpeg-resampler: Try to document async 2013-01-06 17:47:49 +01:00
libavcodec Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355' 2013-01-06 23:48:48 +01:00
libavdevice Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8' 2013-01-04 13:01:54 +01:00
libavfilter lavfi/kerndeint: remove unused pixel_step. 2013-01-06 18:59:15 +01:00
libavformat ff_get_audio_frame_size: try to fix wma in wav 2013-01-06 19:46:04 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-06 13:20:23 +01:00
libavutil lavu: test for broken binutils on ARM 2013-01-05 16:25:37 +01:00
libpostproc build: postproc cleanup. 2012-12-30 02:27:52 +01:00
libswresample lswr: Improve default resampler's default parameters 2013-01-04 16:47:57 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2013-01-05 13:37:30 +01:00
presets
tests tests/fate/avfilter.mak: merge pp tests into GPL test list 2013-01-06 19:04:24 +01:00
tools Fix "knwon" typo and add a check in tools/patcheck 2013-01-04 19:24:37 +00:00
.gitignore
arch.mak
Changelog Changelog, update for 1.1 release 2013-01-06 21:28:15 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c cmdutils: update copyright year to 2013 2013-01-03 13:35:12 +02:00
cmdutils.h Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
common.mak
configure lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: sub2video: set resample size. 2013-01-01 23:06:34 +01:00
ffmpeg_opt.c mpegpsenc: Fix SCR handling for DVD 2013-01-04 20:58:59 +01:00
ffmpeg.c add note on windows pipe 2013-01-06 17:47:49 +01:00
ffmpeg.h Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06' 2012-12-20 02:38:02 +01:00
ffplay.c Replace references to "que" with the appropriate word. 2013-01-03 00:21:47 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL
library.mak
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.