[FFmpeg-cvslog] Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 29 14:19:47 2013 +0100| [3c8085dc4250a98405eb64b3765f4ceb8d177c00] | committer: Michael Niedermayer

Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'

* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
  pthread: make ff_thread_release_buffer idempotent.
  mvi: set framerate

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

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