[FFmpeg-cvslog] Merge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 05:04:43 2014 +0100| [69234e29ad65d400752684640cc482278d423eb6] | committer: Michael Niedermayer

Merge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'

* commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5':
  aacps: invert the order of parameters of ipdopd_reset()

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

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