Merge commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2'
[ffmpeg.git] / libavcodec / xface.c
2012-10-15 Stefano Sabatinilavc: add xface image decoder and encoder