aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples/muxing.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-11 22:20:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-11 22:20:32 +0100
commit522c7c37d23538183d94e960dcb9160441726124 (patch)
tree302cec5ae717ec4a5c113c900f115047b508feec /doc/examples/muxing.c
parent525689ede90699df29aaa700fb45fd5659d4ce4e (diff)
parent0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48 (diff)
downloadffmpeg-522c7c37d23538183d94e960dcb9160441726124.tar.gz
Merge commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48' into release/0.10
* commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48': mov: avoid a memleak when multiple stss boxes are present Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions