Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Feb 2012 01:59:09 +0000 (02:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Feb 2012 04:53:35 +0000 (05:53 +0100)
commit18d0a16fc9d189b1d5593f9a42bb2316e9a66ca9
treeaad3d9b1a07b9efebd7435bb27dde147cfa67913
parent950930b461cef025152de406f816a3b2efffb540
parentef1c785f11c168384e42d147648c8fdf5317739b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: make yuv2yuv1 use named registers.
  h264: mark h264_idct_add8_10 with number of XMM registers.
  swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.
  vp8: always update next_framep[] before returning from decode_frame().
  avconv: estimate next_dts from framerate if it is set.
  avconv: better next_dts usage.
  avconv: rename InputStream.pts to last_dts.
  avconv: reduce overloading for InputStream.pts.
  avconv: rename InputStream.next_pts to next_dts.
  avconv: rework -t handling for encoding.
  avconv: set encoder timebase for subtitles.
  pva-demux test: add -vn
  swscale: K&R formatting cosmetics for SPARC code
  apedec: allow the user to set the maximum number of output samples per call
  apedec: do not unnecessarily zero output samples for mono frames
  apedec: allocate a single flat buffer for decoded samples
  apedec: use sizeof(field) instead of sizeof(type)
  swscale: split C output functions into separate file.
  swscale: Split C input functions into separate file.
  bytestream: Add bytestream2 writing API.

The avconv changes are due to massive regressions and bugs not merged yet.

Conflicts:
ffmpeg.c
libavcodec/vp8.c
libswscale/swscale.c
libswscale/x86/swscale_template.c
tests/fate/demux.mak
tests/ref/lavf/asf
tests/ref/lavf/avi
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/seek/lavf_avi
tests/ref/seek/lavf_mkv
tests/ref/seek/lavf_rm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
ffmpeg.c
libavcodec/apedec.c
libavcodec/bytestream.h
libavcodec/vp8.c
libavcodec/x86/h264_idct_10bit.asm
libswscale/Makefile
libswscale/input.c
libswscale/output.c
libswscale/sparc/yuv2rgb_vis.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/x86/output.asm
libswscale/x86/swscale_template.c