[FFmpeg-cvslog] Merge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 01:56:39 2014 +0100| [cd04f0da60bf7717ed34a6d30c7d36fff688b2de] | committer: Michael Niedermayer

Merge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'

* commit '1713eec29add37b654ec6bf262b843d139c1ffc6':
  shorten: pad the internal bitstream buffer

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

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