FFmpeg git repo
Go to file
Michael Niedermayer 2b7c0c9fe1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mp3dec: perform I/S and M/S only when frame mode is joint stereo.
  id3v2: add another mimetype for JPEG image
  lzw: prevent buffer overreads.
  WMAL: Remove inaccurate and unnecessary doxy
  h264: fix cabac-on-stack after safe cabac reader.
  truemotion2: convert packet header reading to bytestream2.

Conflicts:
	libavcodec/lzw.c
	libavcodec/truemotion2.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-30 06:05:39 +02:00
doc img2: glob matching for image series 2012-03-30 00:03:41 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-30 06:05:39 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
libavfilter avfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref(). 2012-03-29 04:11:55 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-30 06:05:39 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
libpostproc
libswresample swr-test: test the new flexible buffering 2012-03-25 21:50:49 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
mt-work
presets
tests fate/vp8-size-change: set bitexact flag 2012-03-29 06:03:55 +02:00
tools
.gitignore Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
Changelog XBM decoder 2012-03-27 20:08:41 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure img2: glob matching for image series 2012-03-30 00:03:41 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: check pts like dts for being in the past. 2012-03-29 22:32:53 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
ffprobe.c
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
README
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.