From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 8 Aug 2013 10:28:57 +0000 (+0200)
Subject: Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'
X-Git-Tag: n2.1~1585
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/50b7ce12574df47ac5380b05259f10e6b516fb17?hp=50b7ce12574df47ac5380b05259f10e6b516fb17

Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'

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

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