FFmpeg git repo
Go to file
Michael Niedermayer 8c1ebdcea2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  shorten: Use separate pointers for the allocated memory for decoded samples.
  atrac3: Fix crash in tonal component decoding.
  ws_snd1: Fix wrong samples counts.
  movenc: Don't set a default sample duration when creating ismv
  rtp: Factorize the check for distinguishing RTCP packets from RTP
  golomb: avoid infinite loop on all-zero input (or end of buffer).
  bethsoftvid: synchronize video timestamps with audio sample rate
  bethsoftvid: add audio stream only after getting the first audio packet
  bethsoftvid: Set video packet duration instead of accumulating pts.
  bethsoftvid: set packet key frame flag for audio and I-frame video packets.
  bethsoftvid: fix read_packet() return codes.
  bethsoftvid: pass palette in side data instead of in a separate packet.
  sdp: Ignore RTCP packets when autodetecting RTP streams
  proresenc: initialise 'sign' variable
  mpegaudio: replace memcpy by SIMD code
  vc1: prevent using last_frame as a reference for I/P first frame.

Conflicts:
	libavcodec/atrac3.c
	libavcodec/golomb.h
	libavcodec/shorten.c
	libavcodec/ws-snd1.c
	tests/ref/fate/bethsoft-vid

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-17 00:35:06 +01:00
doc prores encoder 2012-02-15 07:14:51 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
libavdevice dshow_filter: fix compilation with mingw-w64 2012-02-16 23:25:59 +01:00
libavfilter lavfi/overlay: add logic for avoiding overlaying frames with PTS > main frame PTS 2012-02-17 00:28:35 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
libavutil audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map. 2012-02-15 10:26:25 +01:00
libpostproc
libswresample
libswscale swscale: enable some more SIMD functions. 2012-02-15 00:41:40 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
tools
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-02-15 01:52:14 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.