virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
38,281 Commits 37 Branches 400 Tags 460 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
574dcb5baf
Go to file
Michael Niedermayer 574dcb5baf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: don't guess r_frame_rate from either stream or codec timebase.
  avconv: set discard on input streams automatically.
  Fix parser not to clobber has_b_frames when extradata is set.
  lavf: don't set codec timebase in avformat_find_stream_info().
  avconv: saner output video timebase.
  rawdec: set timebase to 1/fps.
  avconv: refactor vsync code.
  FATE: remove a bunch of useless -vsync 0
  cdxl: bit line plane arrangement support
  cdxl: remove early check for bpp
  cdxl: set pix_fmt PAL8 only if palette is available

Conflicts:
	ffmpeg.c
	libavcodec/h264_parser.c
	libavformat/rawdec.c
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/h264.mak
	tests/fate/prores.mak
	tests/fate/video.mak
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/creatureshock-avs
	tests/ref/fate/ea-cmv
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/nuv
	tests/ref/fate/prores-alpha
	tests/ref/fate/qtrle-16bit
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/real-rv40
	tests/ref/fate/rpza
	tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-27 04:35:35 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-02-27 04:35:35 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-27 04:35:35 +01:00
libavdevice lavd/lavfi: support all sample formats. 2012-02-22 11:37:32 +01:00
libavfilter libavfilter/libmpcodecs: add vf_pp from current mplayer svn 2012-02-26 20:39:32 +01:00
libavformat cdxl demux: do not create packets with uninitialized data at EOF. 2012-02-26 19:39:59 +01:00
libavutil eval: add root() to solve f(x)=0 2012-02-27 00:00:55 +01:00
libpostproc Remove libpostproc. 2012-02-23 19:36:16 +01:00
libswresample libswr: allow to set custom matrices. 2012-02-20 20:46:35 +01:00
libswscale swscale: fix another integer overflow at large dimensions/rescales. 2012-02-24 15:39:55 -08:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-02-27 04:35:35 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Remove libpostproc. 2012-02-23 19:36:16 +01:00
Changelog Remove libpostproc. 2012-02-23 19:36:16 +01:00
cmdutils_common_opts.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
cmdutils.c Remove libpostproc. 2012-02-23 19:36:16 +01:00
cmdutils.h cmdutils: add -cpuflags. 2012-02-19 21:17:25 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure libavfilter/libmpcodecs: add vf_pp from current mplayer svn 2012-02-26 20:39:32 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-02-27 04:35:35 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Remove libpostproc. 2012-02-23 19:36:16 +01:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01: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.