FFmpeg git repo
Go to file
Michael Niedermayer feb997577b Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
  riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
  pam: Fix a typo that broke writing and reading PAM files.
  mxfdec: fix memleak on av_realloc failures
  mxfdec: Do not parse slices or DeltaEntryArrays.
  mxfdec: hybrid demuxing/seeking solution
  mxfdec: Add Avid's essence element key.
  mfxdec: Separate mxf_essence_container_uls for audio and video.
  mxfdec: Compute packet offsets properly.
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
  mxfdec: use av_dlog() for 'no corresponding source package found'
  mxfdec: Make mxf->partitions sorted by offset.
  mxfdec: parse ThisPartition
  mxfdec: Speed up metadata and index parsing.
  mxfdec: Make sure DataDefinition is consistent between material track and source track.
  mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
  mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
  mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
  mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
  mxfdec: check return value of avio_seek
  mxfdec: skip to end of structural sets
  ...

Conflicts:
	configure
	libavcodec/pnm.c
	libavformat/mxfdec.c
	libavformat/riff.c
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-23 01:05:20 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
libavdevice
libavfilter avfilter: add some asserts() to check refcounts. 2012-01-22 19:30:40 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
libavutil base64: 10l endian fix. 2012-01-22 23:06:04 +01:00
libpostproc pp: bump major in git master to match what debian contains. 2012-01-18 21:21:05 +01:00
libswresample
libswscale sws: Fix unscaled >8bit planar chroma handling. 2012-01-22 15:30:06 +01:00
mt-work
presets
tests Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" 2012-01-22 23:40:24 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
Changelog Finalize changelog for 0.8 Release 2012-01-21 18:37:25 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: include type in filter list. 2012-01-19 23:33:17 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c git show 2473a45c85 avconv.c | patch ffmpeg.c 2012-01-21 23:23:23 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
ffprobe.c ffprobe: increase precision for the shown float values 2012-01-20 13:27:57 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.