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)
* commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8':
  rtpenc_vp8: Include the picture number in VP8 packets

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

Simple merge
Simple merge