Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 10:28:57 +0000 (12:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 10:29:35 +0000 (12:29 +0200)
commit50b7ce12574df47ac5380b05259f10e6b516fb17
tree8dbcfa89f8f539d011db6d9f542182221f8a1255
parent69ea65b46f1a101f9a4f2c914c75b752122e7cbe
parent7a82022ee2f9b1fad991ace0936901e7419444be
Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_parser.c