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)
* commit '7a82022ee2f9b1fad991ace0936901e7419444be':
  h264_parser: Initialize the h264dsp context in the parser as well

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

Simple merge