[FFmpeg-cvslog] Merge remote-tracking branch 'stev47/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep  1 14:22:58 2012 +0200| [75a4b91f8354fbae24a38b94b26ddac6a114014e] | committer: Michael Niedermayer

Merge remote-tracking branch 'stev47/master'

* stev47/master:
  cpia: move reget_buffer after header check

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

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