Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:19:47 +0000 (14:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:19:56 +0000 (14:19 +0100)
commit3c8085dc4250a98405eb64b3765f4ceb8d177c00
tree69b6249cb0ee3476243f87e8b9125788cf10752a
parent31d8d61f590ef6ebc22607d891158fc418c796a7
parente6b1c3bbe7082c71ea8ee8ac83698c156c9e4838
Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pthread.c
libavformat/mvi.c