summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-09 18:08:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-09 18:09:26 +0200
commit962654f25137ee8a8f75625ee8f5440db060fc9f (patch)
treecbc953e59f298f5928ca9d4b94aa3c75088da98b
parent551813a963b2c04d0211a6c87ecd400bdcf2c5f7 (diff)
parentb380337020e271c5431aa8ef8f8e9dfda5e919b2 (diff)
Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'
* commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2': mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail See: 1382add59df149193620ca0714ceac0929208c88 Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions