aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-16 23:22:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-16 23:22:42 +0200
commit5c14b282d1cc407f6b9efb03564ecac75fb59471 (patch)
tree4fd5f621a4ef4e4bdaabfa74dc000af282fe3a49 /libavutil
parent9946a6aa55b71b7a46b4d835f9554cca9fba7234 (diff)
parentae702edf438c67ea5ad257a6779f68900edd88c9 (diff)
downloadffmpeg-5c14b282d1cc407f6b9efb03564ecac75fb59471.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: flacdec: read attached pictures. lavf: don't segfault when a NULL filename is passed to avformat_open_input() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions