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)
* commit '1fc64e2e07787bbca82a72c146588e850e6d098a':
  rtpenc: Write conditional statements on separate lines

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

Simple merge
Simple merge