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)
commit8c895ae73f81a5db66f3bfeac3d91da5c4e179e2
tree91232c2e193df19a9bb1a22657f3e3e07cb610df
parent4ba8560077a19ae12bf0c875c57cdaa72d690441
parentf797b134cad4d248b1c8955659997980d0668bc3
Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'

* 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>
libavformat/rtpenc_chain.c
libavformat/rtsp.c
libavformat/sapenc.c