aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-17 14:06:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-17 14:06:11 +0100
commit8d07bbca6360a938c607dab4dcb333e12f3d915b (patch)
tree9f253cc9866c746732ab2d07edb4d87b25e3799c /libavformat/mpeg.h
parent021b3497e1bccd4d6b2e54ecf89cfd43793a2489 (diff)
parentf322b2073581119de5da74f92a03309a36891cfa (diff)
downloadffmpeg-8d07bbca6360a938c607dab4dcb333e12f3d915b.tar.gz
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/mpeg.h')
0 files changed, 0 insertions, 0 deletions