[FFmpeg-cvslog] Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 12:28:57 2013 +0200| [50b7ce12574df47ac5380b05259f10e6b516fb17] | committer: Michael Niedermayer

Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'

* commit '7a82022ee2f9b1fad991ace0936901e7419444be':
  h264_parser: Initialize the h264dsp context in the parser as well

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

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