diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-17 14:06:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-17 14:06:11 +0100 |
| commit | 8d07bbca6360a938c607dab4dcb333e12f3d915b (patch) | |
| tree | 9f253cc9866c746732ab2d07edb4d87b25e3799c /libavformat/rtpenc.h | |
| parent | 021b3497e1bccd4d6b2e54ecf89cfd43793a2489 (diff) | |
| parent | f322b2073581119de5da74f92a03309a36891cfa (diff) | |
Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'
* commit 'f322b2073581119de5da74f92a03309a36891cfa':
lavr: only save/restore the mixing matrix if mixing is being done
rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
rtpenc: Allow including a SDES/CNAME block in RTCP SR packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.h')
| -rw-r--r-- | libavformat/rtpenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 04b8fc7305..f304ea8c58 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -30,6 +30,7 @@ struct RTPMuxContext { AVStream *st; int payload_type; uint32_t ssrc; + const char *cname; uint16_t seq; uint32_t timestamp; uint32_t base_timestamp; |