aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples/muxing.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-11 22:51:05 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-11 22:51:08 +0100
commit90afa95a55a26bd407604e279f3bb551201ed6d7 (patch)
treeed8ddb70bb9c3bfd5363758bd4c2a4e25646b96e /doc/examples/muxing.c
parent817ed4fae9d0221af12f60309db8b8263e60c9c8 (diff)
parentec5b2f6a385959048f780b4e7d3d259dc1fa8421 (diff)
downloadffmpeg-90afa95a55a26bd407604e279f3bb551201ed6d7.tar.gz
Merge commit 'ec5b2f6a385959048f780b4e7d3d259dc1fa8421' into release/0.10
* commit 'ec5b2f6a385959048f780b4e7d3d259dc1fa8421': tiff: Check that there is no aliasing in pixel format selection Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions