• 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
..
Makefile Loading commit data...
alldevices.c Loading commit data...
alsa-audio-common.c Loading commit data...
alsa-audio-dec.c Loading commit data...
alsa-audio-enc.c Loading commit data...
alsa-audio.h Loading commit data...
avdevice.c Loading commit data...
avdevice.h Loading commit data...
bktr.c Loading commit data...
dshow.c Loading commit data...
dshow.h Loading commit data...
dshow_common.c Loading commit data...
dshow_enummediatypes.c Loading commit data...
dshow_enumpins.c Loading commit data...
dshow_filter.c Loading commit data...
dshow_pin.c Loading commit data...
dv1394.c Loading commit data...
dv1394.h Loading commit data...
fbdev.c Loading commit data...
jack_audio.c Loading commit data...
lavfi.c Loading commit data...
libavdevice.v Loading commit data...
libcdio.c Loading commit data...
libdc1394.c Loading commit data...
openal-dec.c Loading commit data...
oss_audio.c Loading commit data...
pulse.c Loading commit data...
sdl.c Loading commit data...
sndio_common.c Loading commit data...
sndio_common.h Loading commit data...
sndio_dec.c Loading commit data...
sndio_enc.c Loading commit data...
timefilter.c Loading commit data...
timefilter.h Loading commit data...
v4l.c Loading commit data...
v4l2.c Loading commit data...
vfwcap.c Loading commit data...
x11grab.c Loading commit data...