Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:59:58 +0000 (14:59 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:59:58 +0000 (14:59 +0100)
commit8a1c79024da48ef44cc0ba5252ec6fc28e62453b
tree01fad1d1899fdecdefbac5aba99a43a4a5fe10be
parent8a6cc30b04287adf30ef24a27362fa3d0275f02c
parentfa55addd23c2f168163175aee17adb125c2c0710
Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
  img2: Drop av_ prefix for a static function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/img2.c