[FFmpeg-cvslog] Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 20 20:32:17 2014 +0200| [02e3e3ea51ffba4067cbd8595396ec677af1f694] | committer: Michael Niedermayer

Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'

* commit '9f99a5f1d078721a30a76aec27c58805b7b87e58':
  mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

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

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