Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Jun 2012 21:22:37 +0000 (23:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Jun 2012 21:22:42 +0000 (23:22 +0200)
commit5c14b282d1cc407f6b9efb03564ecac75fb59471
tree4fd5f621a4ef4e4bdaabfa74dc000af282fe3a49
parent9946a6aa55b71b7a46b4d835f9554cca9fba7234
parentae702edf438c67ea5ad257a6779f68900edd88c9
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>
libavformat/flacdec.c
libavformat/utils.c