Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:45:43 +0000 (01:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:47:01 +0000 (01:47 +0100)
commitd280d43c2666c5f5c0cd346234391cd9f4076e83
tree87e13b48ce78bacc58e607da9e24f61fe1c4a606
parentcceb737936e69e851977e8471da37d6777ed5a20
parent592a04054e6423be5050efd2bceece48b10b9c1d
Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'

* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
  pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:
libavutil/pixdesc.c

See: c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/pixdesc.c