RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-17 12:51:36 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
38,938 Commits 37 Branches 400 Tags 258 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
479fb7b8af
Go to file
Michael Niedermayer 479fb7b8af Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  fix space type in Changelog
  ZeroCodec Decoder
  RealAudio Lossless decoder
  rtpenc: Use AVFormatContext.packet_size instead of a private option
  url: Document the expected behaviour of url_read
  libavformat: Use AVFormatContext.probesize in init_input
  docs: Fix a stray reference to tags in the generic doxy on dicts
  cosmetics: Align some AVInput/OutputFormat declarations
  zmbv: check decompress result
  zmbv: correct indentation
  adpcm: convert adpcm_thp to bytestream2.
  adpcm: convert adpcm_yamaha to bytestream2.
  adpcm: convert adpcm_swf to bytestream2.
  adpcm: convert adpcm_sbpro to bytestream2.
  adpcm: convert adpcm_ct to bytestream2.
  adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
  adpcm: convert adpcm_ea_xas to bytestream2.
  adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
  adpcm: convert ea_maxis_xa to bytestream2.
  adpcm: convert adpcm_ea to bytestream2.
  ...

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/adpcm.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavcodec/zmbv.c
	libavformat/riff.c
	libavformat/url.h
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-20 00:03:19 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
libavdevice x11grab: fix compilation 2012-03-18 01:12:03 +01:00
libavfilter lavfi/aspect: fail with AVERROR(EINVAL) in case of invalid specified aspect 2012-03-19 20:09:22 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
common.mak
configure ZeroCodec Decoder 2012-03-19 19:02:23 +01: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
Doxyfile
ffmpeg.c ffmpeg: allow selective and complete disabling of map_metadata. 2012-03-17 03:16:09 +01:00
ffplay.c ffplay: force video refresh if the window is resized or damaged 2012-03-15 00:58:13 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input. 2012-03-12 03:31:59 +01:00
INSTALL
library.mak
LICENSE Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-04 02:34:14 +01:00
README
RELEASE
version.sh

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.