RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
32,095 Commits 36 Branches 392 Tags 310 MiB
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer bd4640375e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Replace goto redo on decode fail with continue.
  avconv: Remove dead store.
  libx264: add 'crf_max' private option.
  libx264: add 'weightp' private option.
  libx264: add 'rc_lookahead' private option.
  libx264: add 'psy_trellis' private option.
  libx264: add 'psy_rd' private option.
  libx264: add 'aq_strength' private option.
  libx264: add 'aq_mode' private option.
  libx264: add 'cqp' private option.
  libx264: add 'crf' private option.
  lavc: remove vbv_delay option
  lavf utils: Fix bad indentation.
  avconv: use av_clip_int16 for audio clipping

Conflicts:
	libavcodec/libx264.c
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-08-24 20:26:48 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-08-24 20:26:48 +02:00
libavdevice lavdev/lavfi: set sample aspect ratio in the output stream/codec context 2011-08-21 15:27:09 +02:00
libavfilter lavfi: rename vsrc_movie.c to src_movie.c 2011-08-23 15:45:53 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-08-24 20:26:48 +02:00
libavutil lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests h264-422: fix fate to handle 10 bit formats on big endian correctly. 2011-08-24 18:38:46 +02:00
tools lavfi-showfiltfmts: extend output format for specifying audio data 2011-07-28 10:04:09 +02:00
.gitignore lavc: add a table of all codecs names. 2011-08-22 10:54:44 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE
…
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Fix NASM include directive 2011-08-15 11:24:35 -07:00
README
…
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-08-24 20:26:48 +02:00
cmdutils.c Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
cmdutils.h Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
cmdutils_common_opts.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
ffmpeg.c ffmpeg: use avcodec_get_name to report missing en/decoders. 2011-08-22 12:13:27 +02:00
ffplay.c ffplay: remove unnecessary if (cur_stream) checks 2011-08-21 20:33:02 +02:00
ffprobe.c ffprobe: use av_get_media_type_string() in media_type_string(), simplify 2011-08-20 14:20:25 +02:00
ffserver.c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +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.

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

* See the LICENSE file.