Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Dec 2012 12:46:46 +0000 (13:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Dec 2012 12:46:54 +0000 (13:46 +0100)
commit021b3497e1bccd4d6b2e54ecf89cfd43793a2489
tree037a86c27ad153bf52887f48e80d5c83038f9117
parent0f450ac575b1c1b9d92f139d67f7c83552b392d0
parent65e053271a98f7acf3ef6b412998cfcb44a8eef8
Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8'

* commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8':
  rtpenc_vp8: Include the picture number in VP8 packets

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