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)
commitba42096d9acb73cc9b74685bf822a3180d96bab5
treedb8ec71f12e0850f89405c1a534f9264c1243b57
parentd5f8a642f6eb1c6e305c41dabddd0fd36ffb3f77
parente336c51e6ffcdb93fbcf3c6153d378400608526b
Merge commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b'

* commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b':
  pixdesc: Consistently order components

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