Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 10:23:55 +0000 (12:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 10:24:00 +0000 (12:24 +0200)
commitb0458e62c8fc7830da9b096d851219177185e296
tree6d2a551ca6bb29a5d6f9c72b831c0c2fa0cdbe8c
parentf2254e36c04898a5643f365e360e6031c78a1adb
parent4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/cafdec.c