• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 · 568e9062
    Michael Niedermayer authored
    * qatar/release/0.8: (154 commits)
      Update Changelog for the 0.8.1 Release
      dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
      dca: don't use av_clip_uintp2().
      snow: check reference frame indices.
      snow: reject unsupported chroma shifts.
      xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
      h264: increase reference poc list from 16 to 32.
      h264: stricter reference limit enforcement.
      h264: improve parsing of broken AVC SPS
      Replace computations of remaining bits with calls to get_bits_left().
      png: convert to bytestream2 API.
      roqvideo: convert to bytestream2 API.
      smc: port to bytestream2 API.
      tgq: convert to bytestream2 API.
      algmm: convert to bytestream2 API.
      jvdec: unbreak video decoding
      h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
      libx264: add 'stats' private option for setting 2pass stats filename.
      libx264: fix help text for slice-max-size option.
      avconv: reindent
      ...
    
    Conflicts:
    	Changelog
    	RELEASE
    	avconv.c
    	doc/APIchanges
    	ffplay.c
    	libavcodec/Makefile
    	libavcodec/aacdec.c
    	libavcodec/alsdec.c
    	libavcodec/atrac3.c
    	libavcodec/avcodec.h
    	libavcodec/dvdata.c
    	libavcodec/fraps.c
    	libavcodec/golomb.h
    	libavcodec/h264.c
    	libavcodec/h264.h
    	libavcodec/h264_cabac.c
    	libavcodec/h264_cavlc.c
    	libavcodec/h264_direct.c
    	libavcodec/h264_parser.c
    	libavcodec/h264_ps.c
    	libavcodec/h264idct_template.c
    	libavcodec/indeo3.c
    	libavcodec/kgv1dec.c
    	libavcodec/kmvc.c
    	libavcodec/mjpegbdec.c
    	libavcodec/mmvideo.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/mpegvideo.h
    	libavcodec/options.c
    	libavcodec/pngdec.c
    	libavcodec/roqvideodec.c
    	libavcodec/shorten.c
    	libavcodec/svq3.c
    	libavcodec/utils.c
    	libavcodec/version.h
    	libavcodec/wmadec.c
    	libavcodec/xxan.c
    	libavformat/Makefile
    	libavformat/asfdec.c
    	libavformat/dv.c
    	libavformat/mov.c
    	libavformat/nsvdec.c
    	libavformat/utils.c
    	libavformat/version.h
    	libavutil/avutil.h
    	libavutil/error.c
    	libavutil/error.h
    	libswscale/swscale.c
    	libswscale/utils.c
    	libswscale/x86/swscale_template.c
    	tests/ref/acodec/g722
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    568e9062
ffmpeg.c 190 KB