• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b5a69e79
    Michael Niedermayer authored
    * qatar/master:
      rtpdec: Use our own SSRC in the SDES field when sending RRs
      Finalize changelog for 0.8 Release
      Prepare for 0.8 Release
      threads: change the default for threads back to 1
      threads: update slice_count and slice_offset from user context
      aviocat: Remove useless includes
      doc/APIChanges: fill in missing dates and hashes
      Revert "avserver: fix build after the next bump."
      mpegaudiodec: switch error detection check to AV_EF_BUFFER
      lavf: rename fer option and document resulting (f_)err_detect options
      lavc: rename err_filter option to err_detect and document it
      mpegvideo: fix invalid memory access for small video dimensions
      movenc: Reorder entries in the MOVIentry struct, for tigheter packing
      rtsp: Remove extern declarations for variables that don't exist
      aviocat: Flush the output before closing
    
    Conflicts:
    	Changelog
    	RELEASE
    	libavcodec/mpegaudiodec.c
    	libavcodec/pthread.c
    	libavformat/options.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b5a69e79
ffserver.c 155 KB