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)
commit5d97af0cb2a67ba7f708477dc3f0b5220ac27f43
treeda8743aa9cc59997c9f824919ec839912c54f9d2
parent7c0ab0a3b8e49d0cab3f023e7d9cd49e5d9485be
parentdf07c07b3de0a5e8890078944de1eb5cb8372ef8
Merge commit 'df07c07b3de0a5e8890078944de1eb5cb8372ef8'

* commit 'df07c07b3de0a5e8890078944de1eb5cb8372ef8':
  rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data

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