[FFmpeg-cvslog] Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 13 22:12:56 2014 +0200| [d3d265bae2b2f3d9a70329ffebb3ea04118512e7] | committer: Michael Niedermayer

Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'

* commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9':
  h263dec: call get_format after setting resolution and profile

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

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