Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 20:11:21 +0000 (21:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 20:11:42 +0000 (21:11 +0100)
* qatar/master:
  h264: free the tables and uninitialize the context on flush

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

Simple merge