RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-10 08:40:57 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
36,535 Commits 37 Branches 400 Tags 267 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
3edff185ab
Go to file
Michael Niedermayer 3edff185ab Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  ipmovie: do not read audio packets before the codec is known
  truemotion2: check size before GetBitContext initialisation
  avio: Only do implicit network initialization for network protocols
  avio: Add an URLProtocol flag for indicating that a protocol uses network
  adpcm: ADPCM Electronic Arts has always two channels
  matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
  fate: Add missing reference file from 9b4767e4.
  mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
  4xm: Prevent buffer overreads.
  mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
  vp3: add fate test for non-zero last coefficient
  vp3: fix streams with non-zero last coefficient
  swscale: remove unused U/V arguments from yuv2rgb_write().
  timer: K&R formatting cosmetics
  lavf: cosmetics, reformat av_read_frame().
  lavf: refactor av_read_frame() to make it easier to understand.
  Report an error if pitch_lag is zero in AMR-NB decoder.
  Revert "4xm: Prevent buffer overreads."
  4xm: Prevent buffer overreads.
  4xm: pass the correct remaining buffer size to decode_i2_frame().
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/mjpegdec.c
	libavcodec/truemotion2.c
	libavformat/ipmovie.c
	libavformat/mov_chan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-06 02:45:12 +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-06 02:45:12 +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-06 02:45:12 +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
.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 Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +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: add support to option -show_error 2012-01-04 01:06:28 +01:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.