diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:31:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:31:26 +0100 |
| commit | 78c59f3f0c9f20c3d143bd75fdf125bdf032b16d (patch) | |
| tree | e1ac24088abb4a0434e358f82e30150123ce2031 /tools | |
| parent | 769b473a418638c74020998388b0be74f2ff1858 (diff) | |
| parent | bde2bba45c2f2df27a8534028bda09a6e7f835e2 (diff) | |
| download | ffmpeg-78c59f3f0c9f20c3d143bd75fdf125bdf032b16d.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions