[FFmpeg-cvslog] Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 19 13:58:14 2012 +0200| [81ff0c24ef050c1877639ecc3ba6c485fde0a74e] | committer: Michael Niedermayer

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
  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: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81ff0c24ef050c1877639ecc3ba6c485fde0a74e
---