Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Feb 2012 03:00:43 +0000 (04:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Feb 2012 03:00:43 +0000 (04:00 +0100)
commitb008ac18bb6072acb355445436a999c940538d84
tree29d0042d7a4d0bc64f452440c2060a13a1e00e51
parent7b9d8703f35585b065c32194b52131b7dd90c710
parentd6a77e2b97f3968b99798faeb70e873eb5910849
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  docs: use -bsf:[vas] instead of -[vas]bsf.
  mpegaudiodec: Prevent premature clipping of mp3 input buffer.
  lavf: move the packet keyframe setting code.
  oggenc: free comment header for all codecs
  lcl: error out if uncompressed input buffer is smaller than framesize.
  mjpeg: abort decoding if packet is too large.
  golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
  get_bits: add HAVE_BITS_REMAINING macro.
  lavf/output-example: use new audio encoding API correctly.
  lavf/output-example: more proper usage of the new API.
  tiff: Prevent overreads in the type_sizes array.
  tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
  apetag: do not leak memory if avio_read() fails
  apetag: propagate errors.
  SBR DSP x86: implement SSE sbr_hf_g_filt
  SBR DSP x86: implement SSE sbr_sum_square_sse
  SBR DSP: use intptr_t for the ixh parameter.

Conflicts:
doc/bitstream_filters.texi
doc/examples/muxing.c
doc/ffmpeg.texi
libavcodec/golomb.h
libavcodec/x86/Makefile
libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
doc/bitstream_filters.texi
doc/examples/muxing.c
doc/ffmpeg.texi
libavcodec/get_bits.h
libavcodec/golomb.h
libavcodec/lcldec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec.c
libavcodec/tiff.c
libavcodec/x86/Makefile
libavformat/apetag.c
libavformat/oggenc.c
libavformat/utils.c