Merge commit 'df07c07b3de0a5e8890078944de1eb5cb8372ef8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 19:40:34 +0000 (20:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Dec 2014 19:40:39 +0000 (20:40 +0100)
* commit 'df07c07b3de0a5e8890078944de1eb5cb8372ef8':
  rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data

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

Simple merge