Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Nov 2012 17:00:56 +0000 (18:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Nov 2012 17:03:04 +0000 (18:03 +0100)
commitb044e81f069cc97488868c3f2ef393c193644f0c
tree541398d67de0b56e77bd4019beeafc1c9e817d1f
parent6ff544e473a5ba9d583a4c8510d8a724e0a18c91
parentae3822bca16f1cdb2460a35b16f8ef636a04314e
Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'

* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
  imgconvert: remove PixFmtInfo

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/imgconvert.c