Merge commit '9c80ed836a511293f4cc3a858060969d32f2b1ce'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jan 2013 10:35:46 +0000 (11:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jan 2013 10:35:57 +0000 (11:35 +0100)
commit7b822b1de2eaae56b11b7bfe0d6768723ac67200
tree49999c53938b23f32dde876697dc0615e7e20e5b
parentaed58f6aae0c00a0df5ef31ec3362f47ce773f62
parent9c80ed836a511293f4cc3a858060969d32f2b1ce
Merge commit '9c80ed836a511293f4cc3a858060969d32f2b1ce'

* commit '9c80ed836a511293f4cc3a858060969d32f2b1ce':
  rtpdec_vp8: Avoid a warning about a possibly unused variable
  rtpdec_vp8: Make sure the previous packet is returned

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