RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
30,044 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
75a37b57a5
Go to file
Michael Niedermayer 75a37b57a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/dca.c
	libavcodec/h264.c
	libavcodec/mdec.c
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/version.h
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-19 06:00:31 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
libavdevice
libavfilter Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
libavformat av_find_stream_info: Print more details about max anaylize duration failures. 2011-05-19 03:45:00 +02:00
libavutil eval: opensolaris strtod() cannot handle 0x1234 2011-05-18 00:01:40 +02:00
libpostproc
libswscale swscale: fix compile on mingw32 2011-05-14 13:22:46 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
tools Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
.gitignore
Changelog update changelog with 9/10 bit H264 and FFV1 changes 2011-05-16 23:30:41 -04:00
cmdutils_common_opts.h
cmdutils.c cmdutils: Allocate private decoder context if its not allocated yet. 2011-05-16 21:26:18 +02:00
cmdutils.h
common.mak
configure configure: favor pkg_config over sdl_config 2011-05-18 17:17:56 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Add support for request_sample_format in ffmpeg and ffplay. 2011-05-18 17:27:06 -04:00
ffplay.c Add support for request_sample_format in ffmpeg and ffplay. 2011-05-18 17:27:06 -04:00
ffprobe.c
ffserver.c
ffserver.h
INSTALL
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
README
subdir.mak
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.