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)
* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

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

Simple merge