Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 May 2014 10:37:01 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 May 2014 10:53:46 +0000 (12:53 +0200)
* commit 'f797b134cad4d248b1c8955659997980d0668bc3':
  rtpenc_chain: Don't copy the time base to the source stream by default

See: 1fe40e1b0538a8eb8425123c47775b5d141ae084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc_chain.c
libavformat/rtsp.c
libavformat/sapenc.c

Simple merge
Simple merge
Simple merge