aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples/muxing.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-11 23:11:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-11 23:11:51 +0100
commita0316589e472d9372daf5f5afd1e17a69ded226d (patch)
treefbb6da40eaf65aa302f1f782220609aef9203008 /doc/examples/muxing.c
parent9575bd6a9d4c9527f09e3d906b338d6c184bafce (diff)
parent335ec616cc38ee6206a3acebd46d01aad73d721b (diff)
downloadffmpeg-a0316589e472d9372daf5f5afd1e17a69ded226d.tar.gz
Merge commit '335ec616cc38ee6206a3acebd46d01aad73d721b' into release/0.10
* commit '335ec616cc38ee6206a3acebd46d01aad73d721b': utvideodec: Handle slice_height being zero Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions