Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:00:57 +0000 (01:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:01:01 +0000 (01:01 +0100)
commitcfe33c98b74b97e9b06231ffb981aefdb15be189
tree299fb684d04805da1be00acf59b084923b0d39ca
parentba069e08bdaa431ed8198ac20d2e648de95bc664
parent1fc64e2e07787bbca82a72c146588e850e6d098a
Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'

* commit '1fc64e2e07787bbca82a72c146588e850e6d098a':
  rtpenc: Write conditional statements on separate lines

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