1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 2f56a97f24 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  H.264: fix filter_mb_fast with 4:4:4 + 8x8dct
  alsa: limit buffer_size to 32768 frames.
  alsa: fallback to buffer_size/4 for period_size.
  doc: replace @pxref by @ref where appropriate
  mpeg1video: don't abort if thread_count is too high.
  segafilm: add support for videos with cri adx adpcm
  gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps
  libxvid: Add const qualifier to silence compiler warning.
  H.264: improve qp_thresh check
  H.264: use fill_rectangle in CABAC decoding
  H.264: Remove redundant hl_motion_16/8 code
  H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP
  H.264: faster P-SKIP decoding
  H.264: av_always_inline some more functions
  H.264: Add x86 assembly for 10-bit H.264 predict functions
  swscale: rename uv_off/uv_off2 to uv_off_px/byte.
  swscale: implement error dithering in planarCopyWrapper.
  swscale: error dithering for 16/9/10-bit to 8-bit.
  swscale: fix overflow in 16-bit vertical scaling.
  swscale: fix crash in 8-bpc bilinear output without alpha.
  ...

Conflicts:
	doc/developer.texi
	libavdevice/alsa-audio.h
	libavformat/gxf.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-10 04:28:50 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-07-08 01:05:28 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
libswscale swscale: rename uv_off/uv_off2 to uv_off_px/byte. 2011-07-08 15:15:31 -07:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
Changelog lavdev: add openal input device 2011-06-27 15:26:14 +02:00
cmdutils_common_opts.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
cmdutils.c cmdutils: fix an opt name/val swap in set_context_opts() 2011-07-02 11:54:29 +02:00
cmdutils.h Make all option parsing functions match the function pointer type through which they are called. 2011-06-30 11:49:48 -04:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-07-08 01:05:28 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ffprobe.c Fix segmentation fault in ffprobe 2011-07-03 17:26:59 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE make the RELEASE file say git and not 0.7 2011-07-09 00:28:16 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-08 01:05:28 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.