Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:31:26 +0000 (01:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:31:26 +0000 (01:31 +0100)
commit78c59f3f0c9f20c3d143bd75fdf125bdf032b16d
treee1ac24088abb4a0434e358f82e30150123ce2031
parent769b473a418638c74020998388b0be74f2ff1858
parentbde2bba45c2f2df27a8534028bda09a6e7f835e2
Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'

* commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2':
  rtpenc: Restructure if statements in packetizers to simplify adding more conditions

Conflicts:
libavformat/rtpenc_xiph.c

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