generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,605 Commits 24 Branches 241 Tags
5111c78eab4d10e75a842982a181ded27425bdb8
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 5111c78eab Merge commit 'd1c2f86b21b96c27fac200209f52c98dcb2b3194' into release/2.2 
* commit 'd1c2f86b21b96c27fac200209f52c98dcb2b3194':
  Replace lena.pnm

Conflicts:
	tests/Makefile
	tests/ref/seek/vsynth2-ffv1
	tests/ref/seek/vsynth2-flv
	tests/ref/seek/vsynth2-h261
	tests/ref/seek/vsynth2-h263
	tests/ref/seek/vsynth2-h263p
	tests/ref/seek/vsynth2-ljpeg
	tests/ref/seek/vsynth2-mjpeg
	tests/ref/seek/vsynth2-mpeg1
	tests/ref/seek/vsynth2-mpeg1b
	tests/ref/seek/vsynth2-mpeg2-422
	tests/ref/seek/vsynth2-mpeg2-idct-int
	tests/ref/seek/vsynth2-mpeg2-ilace
	tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
	tests/ref/seek/vsynth2-mpeg2-thread
	tests/ref/seek/vsynth2-mpeg2-thread-ivlc
	tests/ref/seek/vsynth2-mpeg4
	tests/ref/seek/vsynth2-mpeg4-adap
	tests/ref/seek/vsynth2-mpeg4-error
	tests/ref/seek/vsynth2-mpeg4-nr
	tests/ref/seek/vsynth2-mpeg4-qpel
	tests/ref/seek/vsynth2-mpeg4-qprd
	tests/ref/seek/vsynth2-mpeg4-rc
	tests/ref/seek/vsynth2-mpeg4-thread
	tests/ref/seek/vsynth2-msmpeg4
	tests/ref/seek/vsynth2-msmpeg4v2
	tests/ref/seek/vsynth2-rv10
	tests/ref/seek/vsynth2-rv20
	tests/ref/seek/vsynth2-svq1
	tests/ref/seek/vsynth2-wmv1
	tests/ref/seek/vsynth2-wmv2
	tests/ref/vsynth/vsynth2-cljr
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-dnxhd-720p
	tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
	tests/ref/vsynth/vsynth2-dnxhd-720p-rd
	tests/ref/vsynth/vsynth2-dv
	tests/ref/vsynth/vsynth2-dv-411
	tests/ref/vsynth/vsynth2-dv-50
	tests/ref/vsynth/vsynth2-ffv1
	tests/ref/vsynth/vsynth2-ffvhuff
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv
	tests/ref/vsynth/vsynth2-h261
	tests/ref/vsynth/vsynth2-h263
	tests/ref/vsynth/vsynth2-h263-obmc
	tests/ref/vsynth/vsynth2-h263p
	tests/ref/vsynth/vsynth2-huffyuv
	tests/ref/vsynth/vsynth2-jpegls
	tests/ref/vsynth/vsynth2-ljpeg
	tests/ref/vsynth/vsynth2-mjpeg
	tests/ref/vsynth/vsynth2-mpeg1
	tests/ref/vsynth/vsynth2-mpeg1b
	tests/ref/vsynth/vsynth2-mpeg2
	tests/ref/vsynth/vsynth2-mpeg2-422
	tests/ref/vsynth/vsynth2-mpeg2-ilace
	tests/ref/vsynth/vsynth2-mpeg2-thread
	tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4-adap
	tests/ref/vsynth/vsynth2-mpeg4-error
	tests/ref/vsynth/vsynth2-mpeg4-nr
	tests/ref/vsynth/vsynth2-mpeg4-qpel
	tests/ref/vsynth/vsynth2-mpeg4-qprd
	tests/ref/vsynth/vsynth2-mpeg4-rc
	tests/ref/vsynth/vsynth2-mpeg4-thread
	tests/ref/vsynth/vsynth2-msmpeg4
	tests/ref/vsynth/vsynth2-msmpeg4v2
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-rgb
	tests/ref/vsynth/vsynth2-rv10
	tests/ref/vsynth/vsynth2-rv20
	tests/ref/vsynth/vsynth2-svq1
	tests/ref/vsynth/vsynth2-wmv1
	tests/ref/vsynth/vsynth2-wmv2
	tests/ref/vsynth/vsynth2-yuv

See: c4abee734d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 14:46:51 +01:00
compat
Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'
2014-05-31 12:18:31 +02:00
doc
update for 2.2.10
2014-11-01 16:01:28 +01:00
libavcodec
avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation
2014-11-06 01:10:12 +01:00
libavdevice
Revert "v4l2: setting device parameters early"
2014-11-08 14:27:14 +01:00
libavfilter
Merge commit '72ed4166a64714952777fb028b546a52e5b4e2c2' into release/2.2
2014-11-01 15:26:51 +01:00
libavformat
avformat/avidec: fix handling dv in avi
2014-11-21 10:01:31 +01:00
libavresample
Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2
2014-05-04 20:14:18 +02:00
libavutil
avutil/buffer_internal: leave the buffer pool entries volatile
2014-12-02 13:50:46 +01:00
libpostproc
postproc: fix qp count
2014-11-01 15:40:38 +01:00
libswresample
swresample/swresample: fix sample drop loop end condition
2014-10-06 01:31:18 +02:00
libswscale
x86/scale: fix xmm register count for hscale*_sse2
2014-07-15 02:14:55 +02:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
Merge commit 'd1c2f86b21b96c27fac200209f52c98dcb2b3194' into release/2.2
2014-12-02 14:46:51 +01:00
tools
tools/crypto_bench: fix build when AV_READ_TIME is unavailable
2014-09-20 18:40:33 +02:00
.gitattributes
Treat all '*.pnm' files as non-text file
2014-12-01 17:36:05 -08:00
.gitignore
gitignore: Add all examples below doc/examples
2014-03-02 11:42:37 -05:00
arch.mak
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
2012-12-08 14:24:16 +01:00
Changelog
Add some bug references to the changelog
2014-09-17 07:18:39 -07:00
cmdutils_common_opts.h
Allow hiding the banner.
2013-12-29 22:57:20 +01:00
cmdutils_opencl.c
cmdutils_opencl: Use av_malloc_array()
2014-07-14 23:04:44 +02:00
cmdutils.c
cmdutils: update copyright year to 2014.
2014-01-05 22:39:35 +02:00
cmdutils.h
Allow hiding the banner.
2013-12-29 22:57:20 +01:00
common.mak
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
configure
configure: add noexecstack to linker options if supported.
2014-10-05 14:20:32 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
cosmetics: Delete empty lines at end of file.
2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
…
CREDITS
CREDITS: redirect to Git log, remove current outdated content
2013-01-31 18:02:52 +01:00
ffmpeg_filter.c
ffmpeg_filter: refuse to configure input without a decoder.
2014-08-05 04:13:38 +02:00
ffmpeg_opt.c
ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines
2014-09-20 14:29:47 +02:00
ffmpeg_vdpau.c
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffmpeg.c
ffmpeg: Use av_stream_get_parser() to avoid ABI issues
2014-07-14 23:26:06 +02:00
ffmpeg.h
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
2014-02-24 21:08:19 +01:00
ffplay.c
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
2014-02-10 13:26:31 +01:00
ffprobe.c
ffprobe: fix crash happening because of new streams occuring
2014-05-21 22:53:49 +02:00
ffserver.c
ffserver: initialize pbuffer in prepare_sdp_description()
2014-08-05 04:45:56 +02:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
2014-02-17 02:22:01 +01:00
LICENSE
Merge commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe' into release/2.2
2014-09-20 14:46:53 +02:00
MAINTAINERS
update for 2.2
2014-03-01 03:34:59 +01:00
Makefile
tools: add uncoded_frame test program.
2014-02-11 10:31:29 +01:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
update for 2.2.10
2014-11-01 16:01:28 +01:00
version.sh
version.sh: Print versions based on the last git tag for release branches
2014-08-05 22:18:00 +02:00

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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%