• Michael Niedermayer's avatar
    Merge commit '1cd432e1' · 81ff0c24
    Michael Niedermayer authored
    * commit '1cd432e1
    
    ':
      configure: fix libcdio check
      rtsp: Allow setting the reordering buffer size via an AVOption
      rtsp: Vertically align a constant definition
      rtp: Update the check for distinguishing between RTP and RTCP
      aac: fix build with hardcoded tables
      fate: dependencies for screen codec tests
      riff: Move functions around to be covered by appropriate #ifdefs
    
    Conflicts:
    	configure
    	tests/fate/screen.mak
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    81ff0c24