Merge commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:23:32 +0000 (01:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:23:37 +0000 (01:23 +0100)
* commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2':
  rtpenc: Always do the default initialization regardless of codecs

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

Simple merge