• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 27744fe4
    Michael Niedermayer authored
    * qatar/master:
      mpeg12: fixed parsing in some mpeg2 streams
      Add SMPTE240M transfer characteristics flag.
      mpegts: Some additional HDMV types and reg descriptors for mpegts
      motionpixels: Clip YUV values after applying a gradient.
      jpeg: handle progressive in second field of interlaced.
      ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
      h263: more strictly forbid frame size changes with frame-mt.
      h264: additional protection against unsupported size/bitdepth changes.
      tta: prevents overflows for 32bit integers in header.
      configure: remove malloc_aligned.
      vp8: update frame size changes on thread context switches.
      snowdsp: explicitily state instruction size.
      wmall: fix reconstructing audio with uncoded channels
      WMAL cosmetics: fix indentation
      gitignore: add Win32 library suffixes
    
    Conflicts:
    	configure
    	libavcodec/h263dec.c
    	libavcodec/h264.c
    	libavcodec/ituh263dec.c
    	libavcodec/mjpegdec.c
    	libavcodec/wmalosslessdec.c
    	libavcodec/x86/snowdsp_mmx.c
    	libavformat/mpegts.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    27744fe4
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...