• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a78f6b8c
    Michael Niedermayer authored
    * qatar/master: (38 commits)
      v210enc: remove redundant check for pix_fmt
      wavpack: allow user to disable CRC checking
      v210enc: Use Bytestream2 functions
      cafdec: Check return value of avio_seek and avoid modifying state if it fails
      yop: Check return value of avio_seek and avoid modifying state if it fails
      tta: Check return value of avio_seek and avoid modifying state if it fails
      tmv: Check return value of avio_seek and avoid modifying state if it fails
      r3d: Check return value of avio_seek and avoid modifying state if it fails
      nsvdec: Check return value of avio_seek and avoid modifying state if it fails
      mpc8: Check return value of avio_seek and avoid modifying state if it fails
      jvdec: Check return value of avio_seek and avoid modifying state if it fails
      filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
      ffmdec: Check return value of avio_seek and avoid modifying state if it fails
      dv: Check return value of avio_seek and avoid modifying state if it fails
      bink: Check return value of avio_seek and avoid modifying state if it fails
      Check AVCodec.pix_fmts in avcodec_open2()
      svq3: Prevent illegal reads while parsing extradata.
      remove ParseContext1
      vc1: use ff_parse_close
      mpegvideo parser: move specific fields into private context
      ...
    
    Conflicts:
    	libavcodec/4xm.c
    	libavcodec/aacdec.c
    	libavcodec/h264.c
    	libavcodec/h264.h
    	libavcodec/h264_cabac.c
    	libavcodec/h264_cavlc.c
    	libavcodec/mpeg4video_parser.c
    	libavcodec/svq3.c
    	libavcodec/v210enc.c
    	libavformat/cafdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a78f6b8c
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
asynth1.sw Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
codec-regression.sh Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-update.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
fate_config.sh.template Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lavfi-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
tiny_psnr.c Loading commit data...
videogen.c Loading commit data...