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)
* 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>
1  2 
libavformat/flacdec.c
libavformat/utils.c

Simple merge
Simple merge