-
Michael Niedermayer authored
* commit 'bde2bba4': rtpenc: Restructure if statements in packetizers to simplify adding more conditions Conflicts: libavformat/rtpenc_xiph.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
78c59f3f
* commit 'bde2bba4': rtpenc: Restructure if statements in packetizers to simplify adding more conditions Conflicts: libavformat/rtpenc_xiph.c Merged-by:Michael Niedermayer <michaelni@gmx.at>