• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0bd42ae7
    Michael Niedermayer authored
    * qatar/master:
      avformat: Avoid a warning about mixed declarations and code
      BMV demuxer and decoder
      matroskaenc: Make sure the seekhead struct is freed even on seek failure
      mpeg12enc: Remove write-only variables.
      mpeg12enc: Don't set up run-level info for level 0.
      msmpeg4: Don't set up run-level info for level 0.
      avformat: Warn about using network functions without calling avformat_network_init
      avformat: Revise wording
      rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
      rdt: Check the return value of avformat_open
      rtsp: Discard the dynamic handler, if it has an alloc function which failed
      dsputil: use cpuflags in x86 versions of vector_clip_int32()
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavformat/Makefile
    	libavformat/allformats.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0bd42ae7
network.h 3.62 KB