RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 19:32:13 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
32,259 Commits 37 Branches 400 Tags 246 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
0ed7bc49a3
Go to file
Michael Niedermayer 0ed7bc49a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/libx264.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.h
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 00:01:21 +02:00
doc Fix some APIchange versions. 2011-08-30 00:19:58 +02:00
ffpresets Remove libx264 baseline ffpreset 2011-07-28 01:44:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-01 00:01:21 +02:00
libavdevice lavdev/lavfi: add debug traces in lavfi_read_packet() 2011-08-31 16:27:27 +02:00
libavfilter vsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref() 2011-08-31 16:27:33 +02:00
libavformat Support speex in avi. 2011-08-30 23:45:39 +02:00
libavutil fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior 2011-08-30 10:03:13 +02:00
libpostproc postprocess.c: filter name needs to be double 0 terminated 2011-08-26 20:28:54 +02:00
libswscale sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
mt-work
tests fate: Switch default tool to test from avconv to ffmpeg 2011-08-30 18:16:03 +02:00
tools Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
.gitignore lavc: add a table of all codecs names. 2011-08-22 10:54:44 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-01 00:01:21 +02:00
Changelog lavfi: add amovie source - audio movie source 2011-08-27 12:46:55 +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
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
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure lavfi: add amovie source - audio movie source 2011-08-27 12:46:55 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
ffmpeg.c Merge commit 'f593628e5868e52a46de666767896c6afcebdae4' 2011-08-31 00:12:05 +02:00
ffplay.c ffplay: fix a crash caused by aborting the video queue 2011-08-26 17:08:46 +02:00
ffprobe.c ffprobe: introduce output format writers. 2011-08-30 09:28:31 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
INSTALL
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
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.