Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Nov 2011 01:08:21 +0000 (02:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Nov 2011 02:32:24 +0000 (03:32 +0100)
commit8e576d58306df95d6373dd0ca2c1f21f1afaeca9
tree5f7b9c8783b342e80e32b58b94ded819eb414b3c
parent7ffa9ea05aa951b6b13e615f1bd3b8280f758561
parentbbb46f3ec7128d8a624f2aa5b4f99ec44c0b9567
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
27 files changed:
avconv.c
doc/APIchanges
ffmpeg.c
libavcodec/arm/dsputil_armv6.S
libavcodec/arm/dsputil_neon.S
libavcodec/arm/fft_neon.S
libavcodec/arm/fmtconvert_neon.S
libavcodec/arm/h264dsp_neon.S
libavcodec/arm/h264idct_neon.S
libavcodec/arm/int_neon.S
libavcodec/arm/mdct_neon.S
libavcodec/arm/simple_idct_arm.S
libavcodec/bethsoftvideo.c
libavcodec/pcm.c
libavcodec/tiffenc.c
libavfilter/af_aconvert.c
libavfilter/asrc_abuffer.c
libavfilter/defaults.c
libavformat/cdg.c
libavformat/crcenc.c
libavformat/framecrcenc.c
libavformat/md5enc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/fate.mak
tests/ref/fate/nuv