[FFmpeg-cvslog] Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 24 14:04:11 2013 +0100| [40c27504a5fdab915118b9742f93944ee5a6862c] | committer: Michael Niedermayer

Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'

* commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c':
  wmv2: Propagate the wmv2 idct permutation type to the dsputils context
  rtp: Make sure priv_data is set before reading it

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40c27504a5fdab915118b9742f93944ee5a6862c
---