gpac: fix build against current ffmpeg releases
ffmpeg 2.1.3 --devel
Merge remote-tracking branch 'upstream/master'