ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,553 Commits 36 Branches 398 Tags 544 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6a56f4e634
Go to file
Michael Niedermayer 6a56f4e634 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flicvideo: fix invalid reads
  vorbis: Avoid some out-of-bounds reads
  vqf: add more known extensions
  cabac: remove unused function renorm_cabac_decoder
  h264: Only use symbols from the SVQ3 decoder under proper conditionals.
  add bytestream2_tell() and bytestream2_seek() functions
  parsers: initialize MpegEncContext.slice_context_count to 1
  spdifenc: use special alignment for DTS-HD length_code

Conflicts:
	libavcodec/flicvideo.c
	libavcodec/h264.c
	libavcodec/mpeg4video_parser.c
	libavcodec/vorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-07 02:30:27 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-07 02:30:27 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libavfilter volume: remove duplicated condition. 2012-01-05 21:53:18 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-07 02:30:27 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-03 03:06:45 +01:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
Changelog mov: support timecode extraction. 2012-01-05 20:59:52 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: add print_program_info() used in both show_banner() and show_version() 2012-01-06 10:43:30 +01:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: check if number of input and output channels are valid. 2012-01-06 02:05:50 +01:00
ffplay.c ffplay: fix invalid wanted_channel_layout calculation 2012-01-05 20:04:23 +01:00
ffprobe.c ffprobe: exit in case generic options are incompatible with strict XML output 2012-01-06 10:43:34 +01:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: update release maintainers 2012-01-02 16:01:33 +01:00
Makefile
README
RELEASE
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.