[FFmpeg-cvslog] Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 23:40:09 2014 +0200| [19b9e07ef5fdd8558735538a04fac7f428df190c] | committer: Michael Niedermayer

Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'

* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
  rtpdec: pass an AVFormatContext to ff_parse_fmtp()

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

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