1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Michael Niedermayer 81ff0c24ef 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>
2012-10-19 13:58:14 +02:00
..
2012-08-22 16:41:57 -04:00
2012-10-18 13:12:28 +01:00
2012-10-15 08:32:34 +02:00
2012-10-18 13:12:28 +01:00
2012-10-16 15:45:55 +02:00
2012-09-29 16:09:05 +02:00
2012-09-10 00:07:24 +01:00
2012-10-18 13:12:28 +01:00
2012-09-29 16:09:05 +02:00
2012-09-23 15:24:08 +02:00
2012-09-29 16:09:05 +02:00