Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Apr 2013 09:36:35 +0000 (11:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Apr 2013 09:36:39 +0000 (11:36 +0200)
* qatar/master:
  srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
  rtpdec: Increase max rtp packet size to 8192
  lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
  h264pred: Add a few missing const declarations for ff_cropTbl derived pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/sapdec.c
libavformat/srtp.c
libavformat/srtpproto.c

Simple merge
Simple merge
Simple merge