RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
45,630 Commits 37 Branches 400 Tags 254 MiB
C 90.2%
Assembly 7.9%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer c079da5073 Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd' 
* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
	tests/ref/fate/vsynth1-cljr
	tests/ref/fate/vsynth1-ffvhuff
	tests/ref/fate/vsynth1-h261
	tests/ref/fate/vsynth1-h263
	tests/ref/fate/vsynth1-h263-obmc
	tests/ref/fate/vsynth1-h263p
	tests/ref/fate/vsynth1-huffyuv
	tests/ref/fate/vsynth1-jpegls
	tests/ref/fate/vsynth1-mjpeg
	tests/ref/fate/vsynth1-mpeg4-adap
	tests/ref/fate/vsynth1-mpeg4-adv
	tests/ref/fate/vsynth1-mpeg4-error
	tests/ref/fate/vsynth1-mpeg4-nr
	tests/ref/fate/vsynth1-mpeg4-qpel
	tests/ref/fate/vsynth1-mpeg4-qprd
	tests/ref/fate/vsynth1-mpeg4-rc
	tests/ref/fate/vsynth1-mpeg4-thread
	tests/ref/fate/vsynth1-msmpeg4
	tests/ref/fate/vsynth1-msmpeg4v2
	tests/ref/fate/vsynth1-rgb
	tests/ref/fate/vsynth1-wmv1
	tests/ref/fate/vsynth1-wmv2
	tests/ref/fate/vsynth1-yuv
	tests/ref/fate/vsynth2-cljr
	tests/ref/fate/vsynth2-ffvhuff
	tests/ref/fate/vsynth2-h261
	tests/ref/fate/vsynth2-h263
	tests/ref/fate/vsynth2-h263-obmc
	tests/ref/fate/vsynth2-h263p
	tests/ref/fate/vsynth2-huffyuv
	tests/ref/fate/vsynth2-jpegls
	tests/ref/fate/vsynth2-mjpeg
	tests/ref/fate/vsynth2-mpeg4-adap
	tests/ref/fate/vsynth2-mpeg4-error
	tests/ref/fate/vsynth2-mpeg4-nr
	tests/ref/fate/vsynth2-mpeg4-qpel
	tests/ref/fate/vsynth2-mpeg4-qprd
	tests/ref/fate/vsynth2-mpeg4-rc
	tests/ref/fate/vsynth2-mpeg4-thread
	tests/ref/fate/vsynth2-msmpeg4
	tests/ref/fate/vsynth2-msmpeg4v2
	tests/ref/fate/vsynth2-rgb
	tests/ref/fate/vsynth2-wmv1
	tests/ref/fate/vsynth2-wmv2
	tests/ref/fate/vsynth2-yuv
	tests/ref/lavf/avi
	tests/ref/seek/h261_avi
	tests/ref/seek/h263_avi
	tests/ref/seek/h263p_avi
	tests/ref/seek/lavf_avi
	tests/ref/seek/mjpeg_avi
	tests/ref/seek/mpeg4_adap_avi
	tests/ref/seek/mpeg4_error_avi
	tests/ref/seek/mpeg4_nr_avi
	tests/ref/seek/mpeg4_qpel_avi
	tests/ref/seek/mpeg4_qprd_avi
	tests/ref/seek/mpeg4_rc_avi
	tests/ref/seek/mpeg4_thread_avi
	tests/ref/seek/msmpeg4_avi
	tests/ref/seek/msmpeg4v2_avi
	tests/ref/seek/wmv1_avi
	tests/ref/seek/wmv2_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-10-17 14:43:26 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
doc examples/muxing: fix video pts 2012-10-17 02:40:00 +02:00
libavcodec Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 2012-10-17 14:17:55 +02:00
libavdevice
…
libavfilter lavfi: limit matching w/h/fmt asserts to non scale filters 2012-10-17 00:06:12 +02:00
libavformat Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd' 2012-10-17 14:43:26 +02:00
libavresample Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 2012-10-14 14:46:13 +02:00
libavutil Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swr-test: fix division by 0 2012-10-16 19:40:57 +02:00
libswscale sws-test: parse command line args before initing contexts 2012-10-17 11:56:36 +02:00
presets
…
tests Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd' 2012-10-17 14:43:26 +02:00
tools tools/ffeval: do not use UNIX-specific /dev/std{in,out} files 2012-10-16 13:51:44 +02:00
.gitignore gitignore: add *.dylib for those of us on Darwin/OS X systems. 2012-10-16 04:14:09 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog lavc: add xface image decoder and encoder 2012-10-15 08:32:18 +02:00
Doxyfile
…
INSTALL
…
LICENSE
…
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-16 14:15:16 +02:00
README
…
RELEASE
…
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
cmdutils.c
…
cmdutils.h
…
cmdutils_common_opts.h
…
common.mak
…
configure Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 2012-10-16 13:57:10 +02:00
ffmpeg.c ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +02:00
ffmpeg.h ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +02:00
ffmpeg_filter.c ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams 2012-10-16 01:04:42 +02:00
ffmpeg_opt.c Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68' 2012-10-17 14:30:25 +02:00
ffplay.c ffplay: Prevent 0/0 aspect from being passed on to lavfi 2012-10-14 23:40:14 +02:00
ffprobe.c
…
ffserver.c Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 2012-10-17 14:17:55 +02:00
library.mak
…
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.