FFmpeg git repo
Go to file
Michael Niedermayer a58e10e5d1 Merge commit '728214992e3698305550c1762f973d2ac567f016'
* commit '728214992e3698305550c1762f973d2ac567f016':
  vc1dec: Remove interlaced warning
  vc1dec: Fix mixed field/frame intensity compensation
  vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4
  vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed
  vc1dec: Fix doxy for vc1_mc_4mv_chroma4()
  vc1dec: Drop old use_ic code from vc1_b_mc
  vc1: Use shuffled use_ic instead of equally shuffled mv_mode
  vc1dec: Implement intensity compensation for vc1_interp_mc()

Conflicts:
	Changelog
	libavcodec/vc1dec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 03:28:18 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc
libavcodec Merge commit '728214992e3698305550c1762f973d2ac567f016' 2013-05-29 03:28:18 +02:00
libavdevice
libavfilter lavfi/drawutils: attempt to fix subsampling. 2013-05-28 19:20:27 +02:00
libavformat tta: make probing more robust 2013-05-28 11:46:10 +00:00
libavresample
libavutil
libpostproc
libswresample
libswscale
presets
tests j2kdec/jpeg2000dec: partially merge quantization code 2013-05-28 19:02:00 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '728214992e3698305550c1762f973d2ac567f016' 2013-05-29 03:28:18 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure configure: Fix jack auto-detection, broken since 3fc8500 2013-05-28 10:28:16 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: use actual packet pts when discarding for the copypriorss option 2013-05-28 17:03:23 -04:00
ffmpeg.h
ffplay.c ffplay: dont forget passing lowres to private options 2013-05-28 00:09:34 +02:00
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 in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.