Merge commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 10:54:25 +0000 (12:54 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 10:54:25 +0000 (12:54 +0200)
* commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b':
  pixdesc: Consistently order components

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/pixdesc.c

Simple merge