[FFmpeg-cvslog] Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 26 12:23:55 2014 +0200| [b0458e62c8fc7830da9b096d851219177185e296] | committer: Michael Niedermayer

Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0458e62c8fc7830da9b096d851219177185e296
---