Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Oct 2012 11:58:14 +0000 (13:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Oct 2012 11:58:14 +0000 (13:58 +0200)
commit81ff0c24ef050c1877639ecc3ba6c485fde0a74e
tree862e934366547cb8723d94f7f30953cb20d549b8
parent93f244e3abc3d75a797535a8da890bb1f9932433
parent1cd432e167b1a80853760c89a33606e2b5f229c2
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@gmx.at>
configure
libavcodec/aac.h
libavcodec/aac_tablegen.h
libavcodec/aac_tablegen_decl.h
libavformat/riff.c
libavformat/rtp.h
libavformat/rtsp.c
libavformat/rtsp.h
tests/fate/screen.mak